PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,411 Commits 1 Branch 0 Tags
7e974f4c8428b889a45e46aa32832e68c5173f3d
Commit Graph

14411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Civelli
8662a22c99 Merge "Temporary removing the Trust Agent permission change." 2014-06-10 21:49:59 +00:00
Jay Civelli
382a9b9780 Temporary removing the Trust Agent permission change. 
Removing the permission check for Trust Agents, until the GMS core prebuilt
has that permission.

BUG: 15546358

Change-Id: Ie0a68fcc313b835a8f5e87570fd248612c837bd3
 2014-06-11 09:17:46 -07:00
John Spurlock
26ac83df59 Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev 2014-06-10 21:38:43 +00:00
John Spurlock
5845d98a8a Settings: Remove master swtich from battery saver. 
And make it a normal switch called "Always on".  Better reflects
the actual effect.

Change-Id: I9f801ddfff39591cb19d665f61a1a05bda317888
 2014-06-11 18:44:24 -04:00
Vinit Deshpande
c8e2eeeaa1 Fix icon location on Wifi Settings 
Wifi icons are showing up on the right of the name; which is unlike
other settings; this change fixes that.

Wifi settings are using standard preference layout; so moving to the
new location requires setting different property (icon instead of widget)
on the preference fragment.

Bug: 15117166
Change-Id: I5dd0a843139512d16fb70dd99ed12c3584f57895
 2014-06-11 21:22:04 +00:00
Fabrice Di Meglio
f54407933f Merge "Fix bug #15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}" into lmp-preview-dev 2014-06-10 22:06:31 +00:00
Robert Greenwalt
746c6ae949 Merge "Apply LinkProperties changes." into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Robert Greenwalt
a0ac614c08 Apply LinkProperties changes. 
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
(cherry picked from commit 51d898fd02)
 2014-06-10 22:42:12 +00:00
John Spurlock
e9ee5e2ced Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev 2014-06-10 21:36:19 +00:00
Przemyslaw Szczepaniak
72a00c459c Merge "Expose "default tts locale" to the TTS V2 API." 2014-06-10 21:31:35 +00:00
Przemyslaw Szczepaniak
5882320b63 Expose "default tts locale" to the TTS V2 API. 
Accommodate for the changes in frameworks/base. TtsEngines now
uses Locale objects for setting/getting the default locale
for TTS engines.

Change-Id: I518ace8d16d17b2c36a62e4e9d14a3568a38f68e
 2014-06-12 11:44:43 +01:00
vandwalle
4633932a3f Merge "show frequency within debug settings" 2014-06-12 05:34:42 +00:00
vandwalle
8d9a055f84 show frequency within debug settings 
Change-Id: I6ebf08a193fc92b7e0289d663f089ba6e871497d
 2014-06-12 20:29:27 -07:00
Paul Lawrence
9a960c1cb8 am 5b2ea2fd: (-s ours) Merge "DO NOT MERGE: Set quantum pattern for crypt dialogs" into lmp-preview-dev 
* commit '5b2ea2fd6f5d85f05cd48c0824531a65ead7ea3a':
  DO NOT MERGE: Set quantum pattern for crypt dialogs
 2014-06-13 00:05:02 +00:00
Dianne Hackborn
dd1ad04de2 am b11c9737: Fix issue #15597136: n7 not showing estimated discharge time 
* commit 'b11c97379918fce423bfb0b96a8319a8e698845d':
  Fix issue #15597136: n7 not showing estimated discharge time
 2014-06-12 23:57:20 +00:00
Fabrice Di Meglio
204521626f resolved conflicts for merge of f9360dbc to master 
Change-Id: I2e468d83a7ce5200c59f63b4362e7bee10d0a2eb
 2014-06-12 15:46:41 -07:00
Ido Ofir
524a63b493 Small fix to trust agent item in security settings. 
Change-Id: Ie3157e0c9c68bbab5ba394f61c12d1bbf075bb06
 2014-06-12 14:49:25 -07:00
John Spurlock
2bd9eeded4 am 5fe76205: Settings: Workaround duplicate onActivityCreate 
* commit '5fe76205b607f193b5925eccfabddc145118b5ea':
  Settings: Workaround duplicate onActivityCreate
 2014-06-12 20:06:10 +00:00
Alan Viverette
1da878c302 am 8cd7dc23: Merge "Add Settings theme" into lmp-preview-dev 
* commit '8cd7dc23ec5e65504ea3f9c8d5869df2b670879d':
  Add Settings theme
 2014-06-12 19:57:25 +00:00
Dianne Hackborn
3b2be31687 am 9f789fbe: Merge "I am a Material girl, living in a Material world." into lmp-preview-dev 
* commit '9f789fbe082792f57dde72e6c5a501cd0441cd6f':
  I am a Material girl, living in a Material world.
 2014-06-12 18:48:57 +00:00
Fabrice Di Meglio
d5f8823b2a am deb08839: Merge "Fix bug #15384992 Setting Dashboard - padding updates" into lmp-preview-dev 
* commit 'deb088398900bd1c212889c59c9e057795d2b2bd':
  Fix bug  #15384992 Setting Dashboard - padding updates
 2014-06-12 18:48:56 +00:00
Dianne Hackborn
d59d4e25de am 3864cda8: Merge "In a document centric world, hiding from recents makes no sense." into lmp-preview-dev 
* commit '3864cda8fd9f136838481e07c4bd942012eb67ec':
  In a document centric world, hiding from recents makes no sense.
 2014-06-12 18:37:35 +00:00
John Spurlock
a6f8f8b3d9 am 26ac83df: Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev 
* commit '26ac83df5922430b7d7e3eee46c36c7d856bc47c':
  Settings: Remove master swtich from battery saver.
 2014-06-12 18:37:34 +00:00
Vinit Deshpande
63328dedb4 am c8e2eeea: Fix icon location on Wifi Settings 
* commit 'c8e2eeeaa1666d37abc16d0505a1ef6e9a5bae91':
  Fix icon location on Wifi Settings
 2014-06-12 18:37:22 +00:00
Fabrice Di Meglio
b0312debfd am f5440793: Merge "Fix bug #15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}" into lmp-preview-dev 
* commit 'f54407933fd30c0838fcd89d9f4dafaf7af865be':
  Fix bug #15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}
 2014-06-12 16:53:47 +00:00
Robert Greenwalt
9bfee0555b am 746c6ae9: Merge "Apply LinkProperties changes." into lmp-preview-dev 
* commit '746c6ae9492f4e571a35fc07cc68a10b059eade5':
  Apply LinkProperties changes.
 2014-06-12 16:53:44 +00:00
Fabrice Di Meglio
a40da902aa am caf4b1dd: Fix bug #15543626 Bluetooth Settings headers need to support Quantum styling 
* commit 'caf4b1dda2e84760a230944e50569712a39c200c':
  Fix bug #15543626 Bluetooth Settings headers need to support Quantum styling
 2014-06-12 16:07:29 +00:00
Martijn Coenen
8da48ee882 Remove obsolete NFC unlock XML file. 
NFC unlock was moved to TrustAgent. Fixes
build break.

Bug: 15538481
Change-Id: Iaf7f96a38ee36b80168cd92eef0d3b9748caa478
(cherry picked from commit 54a10a0a97)
 2014-06-10 21:28:14 +00:00
John Spurlock
c7f8e8ce69 Settings: Battery saver settings sub-page. 
New battery saver settings page, accessed via
the power usage settings overflow menu.

The settings page has a master switch to toggle
battery saver mode, feature disclosure text,
and a preference to configure the automatic
trigger level.

Remove developer checkbox now that this option
has a real home.

NO_SQ: multi project change
Bug:13329308
Change-Id: Iac54238f3406439711b44a3c17f220ac5e370a37
 2014-06-10 17:26:47 -04:00
Martijn Coenen
50ee528fd8 Merge "Remove obsolete NFC unlock XML file." 2014-06-10 20:56:05 +00:00
Martijn Coenen
54a10a0a97 Remove obsolete NFC unlock XML file. 
NFC unlock was moved to TrustAgent.

Change-Id: Iaf7f96a38ee36b80168cd92eef0d3b9748caa478
 2014-06-10 13:54:39 -07:00
Alan Viverette
6bfec2d6b1 Remove all dialog icons in Settings 
BUG: 15474733
Change-Id: I43ab10a3bbcabdac6109abf80266f1c4b52bf6fb
 2014-06-10 13:41:07 -07:00
Alan Viverette
a29f3bbff4 Merge "Ripple tint is now color" into lmp-preview-dev 2014-06-10 20:14:40 +00:00
Baligh Uddin
bb8830756f Merge "Breaks the build. Issue being tracked in b/15538481" into lmp-preview-dev 2014-06-10 19:49:12 +00:00
Baligh Uddin
279359957f Breaks the build. 
Issue being tracked in b/15538481

Revert "Import translations. DO NOT MERGE"

This reverts commit b9e06ceb16.

Change-Id: I9161a3290a8488d0d896d6dbb41d367317694269
 2014-06-10 19:49:04 +00:00
Fabrice Di Meglio
df055ead66 Merge "Replace ic_settings_language.png asset to the new one" into lmp-preview-dev 2014-06-10 19:12:54 +00:00
Fabrice Di Meglio
65b145e6d5 Replace ic_settings_language.png asset to the new one 
See bug: 15523731 Please replace ic_settings_language.png to new one

Change-Id: I1455396ba91f3d519dd42df5b6ea2095ec20f42f
 2014-06-10 12:10:42 -07:00
Baligh Uddin
cc076fe330 Merge "Fix Build break, will address in parallel." 2014-06-10 18:02:20 +00:00
Baligh Uddin
cf9185c75b Fix Build break, will address in parallel. 
Revert "Import translations. DO NOT MERGE"

This reverts commit b2ceea95f2.

Change-Id: Ie92030c9c3bdde0b7dffd1382e2393126688ce4e
 2014-06-10 18:02:13 +00:00
Fabrice Di Meglio
1e745264fa am 2eae7a40: Merge "Update Sync status icon" into lmp-preview-dev 
* commit '2eae7a40229b132bed632df0879e4056a7c5a107':
  Update Sync status icon
 2014-06-10 17:22:14 +00:00
Fabrice Di Meglio
009c2f20de am f54b6031: Merge "Update assets for "NFC & more"" into lmp-preview-dev 
* commit 'f54b603156c042031af74e3ad73b55b75f058a09':
  Update assets for "NFC & more"
 2014-06-10 17:22:02 +00:00
Fabrice Di Meglio
dbc851ad81 am 195ee660: Merge "Update Recents Search assets" into lmp-preview-dev 
* commit '195ee66013b990f8da06a030fb4889e50d1eeacf':
  Update Recents Search assets
 2014-06-10 17:21:54 +00:00
Fabrice Di Meglio
0f3ab8b4b7 am a13e40f4: Merge "Add icon for Search Recents" into lmp-preview-dev 
* commit 'a13e40f4ce6c9435ba4d014319c371bfa96f252e':
  Add icon for Search Recents
 2014-06-10 17:21:34 +00:00
Baligh Uddin
fa89b8e0dd Merge "Import translations. DO NOT MERGE" 2014-06-10 17:11:23 +00:00
Baligh Uddin
eff52addfc Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-10 17:11:19 +00:00
Adrian Roos
758467f7eb Merge "Fix master build" 2014-06-10 15:16:57 +00:00
Fabrice Di Meglio
1e2ac9efd3 am 66220ba8: Merge "Tune Recents Search and Search Results" into lmp-preview-dev 
* commit '66220ba8491bd479f859fcb054268b7aedef93ef':
  Tune Recents Search and Search Results
 2014-06-10 14:55:41 +00:00
Adrian Roos
07d036a5b2 Fix master build 
Change-Id: Iaad9a63c5971b506cf8052aba48364979ec69c78
 2014-06-10 16:48:07 +02:00
Fabrice Di Meglio
ffdf3dc826 am 310d74fa: Merge "New Battery Material assets" into lmp-preview-dev 
* commit '310d74fa2bd1d9898c327b032eb244b005143b9d':
  New Battery Material assets
 2014-06-10 11:17:58 +00:00
Fabrice Di Meglio
c35394faad am ef40c008: Merge "New Sync Status Material assets" into lmp-preview-dev 
* commit 'ef40c0083b1791704cfd23d97a2775fe74a5ef7b':
  New Sync Status Material assets
 2014-06-10 11:17:57 +00:00