PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,959 Commits 1 Branch 0 Tags
2c53933e8d35ba50d0791a29e46fa3156e9cab7c
Commit Graph

13959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
2c53933e8d Use user restriction instead of pin to guard factory reset in Settings. 
Bug: 14081992
Change-Id: I60f132312368c5097b46ab97e881eec3700ef586
 2014-06-13 13:10:44 -04:00
Julia Reynolds
253b111a3d Merge "Remove PIN from users page - use disallow_add/remove_user restrictions." 2014-06-10 21:38:43 +00:00
Paul Lawrence
9b17be0d4b Merge "Set quantum pattern for crypt dialogs" 2014-06-11 23:10:23 +00:00
Dianne Hackborn
ff0a8a2f43 am 2f2cbbc7: Merge "Small fixes to power save UI." into lmp-preview-dev 
* commit '2f2cbbc760c23d89c5b0255378bbf5cb074a6988':
  Small fixes to power save UI.
 2014-06-12 00:03:50 +00:00
Fabrice Di Meglio
e306098cab am 782d0f68: Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels" into lmp-preview-dev 
* commit '782d0f689106aed05de80e93948f9e7b30701601':
  Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels
 2014-06-12 00:03:34 +00:00
Paul Lawrence
26abe64c3d Set quantum pattern for crypt dialogs 
Bug: 14883421
Change-Id: Icd2c99c3f483d1a9b6571fa1e124322fbf6f3289
 2014-06-11 16:11:12 -07:00
vandwalle
4e278c7c62 Merge "remove disbaled for unknown reason status" 2014-06-11 21:23:31 +00:00
Julia Reynolds
b9195d25ee Remove PIN from users page - use disallow_add/remove_user restrictions. 
Bug: 14081992
Change-Id: If4973d64ae54da602a2682dee5b868ff66273856
 2014-06-11 17:14:14 -04:00
Fabrice Di Meglio
87f06fa594 am 1c3203e8: Merge "Update Settings redlines per UX request" into lmp-preview-dev 
* commit '1c3203e83efed2d5c257da8e4f5fba4844b6fa47':
  Update Settings redlines per UX request
 2014-06-11 17:43:44 +00:00
John Spurlock
69323ad96a am e9ee5e2c: Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev 
* commit 'e9ee5e2cede8d7e8fd7791113903df7eff1ec75a':
  Settings: Battery saver settings sub-page.
 2014-06-11 17:02:20 +00:00
Martijn Coenen
d23aa97454 am 8da48ee8: Remove obsolete NFC unlock XML file. 
* commit '8da48ee882825c43bce7068382ad730fbbc060e7':
  Remove obsolete NFC unlock XML file.
 2014-06-11 17:02:19 +00:00
Alan Viverette
2c461006b8 am 6bfec2d6: Remove all dialog icons in Settings 
* commit '6bfec2d6b197068dd355bd1742179fe3da07136f':
  Remove all dialog icons in Settings
 2014-06-11 13:07:58 +00:00
Alan Viverette
9947787a64 am a29f3bbf: Merge "Ripple tint is now color" into lmp-preview-dev 
* commit 'a29f3bbff43c33aedd028a852bfaf53325fe2538':
  Ripple tint is now color
 2014-06-11 13:07:56 +00:00
Baligh Uddin
c1846e0c19 am bb883075: Merge "Breaks the build. Issue being tracked in b/15538481" into lmp-preview-dev 
* commit 'bb8830756fec3c6ee66b87eb7fe6822d038147ce':
  Breaks the build. Issue being tracked in b/15538481
 2014-06-11 12:41:37 +00:00
Fabrice Di Meglio
da7fee6a62 am df055ead: Merge "Replace ic_settings_language.png asset to the new one" into lmp-preview-dev 
* commit 'df055ead66b11fdc28f9af5641013705d064b516':
  Replace ic_settings_language.png asset to the new one
 2014-06-11 12:41:35 +00:00
Baligh Uddin
fe5f063e45 am eff52add: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit 'eff52addfc1c27d9aadbefe7e1e91f2bb2647ab6':
  Import translations. DO NOT MERGE
 2014-06-11 11:24:36 +00:00
vandwalle
d42ec37dbf remove disbaled for unknown reason status 
Change-Id: Id9fda1b6aeec8e7122a5c00996e5afbec20ac1cb
 2014-06-10 20:47:19 -07:00
Dianne Hackborn
2f2cbbc760 Merge "Small fixes to power save UI." into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Dianne Hackborn
de159c8d16 Small fixes to power save UI. 
Use the correct default setting, and don't crash.

Change-Id: I33fd612aba404e13c8bbe9110535dff1cfba12a4
 2014-06-10 23:17:01 -07:00
Fabrice Di Meglio
782d0f6891 Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels" into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Fabrice Di Meglio
a7a62c5b66 Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels 
- use DateFormat.getBestDateTimePattern(...) to get the best Date and Time format
depending on the Locale
- format the label according to the best format
- remove non needed formatting strings

Change-Id: I78b62b9a7c9401e47e62c7161214636bb43324fc
 2014-06-10 20:26:42 -07:00
Fabrice Di Meglio
da8babaedf Update Settings redlines per UX request 
See bug: #15384992 Setting Dashboard - padding updates

Change-Id: Ie95b6cee701847d7f76f2e2a72aaf8fc64bc4dd9
 2014-06-10 19:36:26 -07:00
Fabrice Di Meglio
1c3203e83e Merge "Update Settings redlines per UX request" into lmp-preview-dev 2014-06-10 22:18:15 +00:00
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
e9ee5e2ced Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev 2014-06-10 21:36:19 +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
Fabrice Di Meglio
9311b08831 am 9f72756f: Merge "Fix bug #14499324 Label of the "Language & input " page doesn\'t get updated ...as per the newly selected language" into lmp-preview-dev 
* commit '9f72756f11647aa2bd4fae2a98a40ccc6e30348c':
  Fix bug #14499324 Label of the "Language & input " page doesn't get updated ...as per the newly selected language
 2014-06-10 11:17:49 +00:00