PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,107 Commits 1 Branch 0 Tags
a41521465e88a2c29d6e41b735ed4593c3531c8c
Commit Graph

22107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xiyuan Xia
89a0ba67ff am dc6bd8d2: Merge "Ignore fp error message when not listening" into mnc-dev 
* commit 'dc6bd8d2f1b2b5f28d59d00ef178e64229ab59ef':
  Ignore fp error message when not listening
 2015-05-30 03:38:09 +00:00
Maurice Lam
8dc986216c [WifiSetup] Add + icon to Add another network 
Add the + icon to "Add another network" in Wi-Fi screen in setup
wizard, and make the text black and sentence case.

Bug: 21089864
Change-Id: Iccfc5fc4ff5e50a599f3004a20e5cfa24a13043a
 2015-05-29 20:34:03 -07:00
Xiyuan Xia
dc6bd8d2f1 Merge "Ignore fp error message when not listening" into mnc-dev 2015-05-30 03:28:52 +00:00
Xiyuan Xia
f1bc6e52b5 Ignore fp error message when not listening 
Bug:21413567
Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88
 2015-05-29 16:19:29 -07:00
Fyodor Kupolov
59e340d735 am 097936ad: Hide guest entry if the user is not allowed to create guest 
* commit '097936ad1b6632787127cbefe38373e9696e377d':
  Hide guest entry if the user is not allowed to create guest
 2015-05-29 21:42:41 +00:00
Fyodor Kupolov
097936ad1b Hide guest entry if the user is not allowed to create guest 
Don't show the Guest entry for a secondary user if the user is not allowed to
create a guest and there is currently no guest already created.

Bug: 19035769
Change-Id: Icf4a778533affaec0658af4da5ce000eda261f38
 2015-05-29 14:07:12 -07:00
Fyodor Kupolov
8a1683f245 am 01f35ce4: Merge "Use DimmableIconPreference for Add user action" into mnc-dev 
* commit '01f35ce46e584e0fd699c3330eba564eb6811dc5':
  Use DimmableIconPreference for Add user action
 2015-05-29 20:58:17 +00:00
Fyodor Kupolov
8e998b71f0 am 2defc457: Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev 
* commit '2defc457bdd0a13f6ece49a20d5120616ca3eaaf':
  Hide the collapse/expand icon if text fits the screen
 2015-05-29 20:52:07 +00:00
Fyodor Kupolov
01f35ce46e Merge "Use DimmableIconPreference for Add user action" into mnc-dev 2015-05-29 20:42:55 +00:00
Fyodor Kupolov
2defc457bd Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev 2015-05-29 20:27:15 +00:00
Tony Mantler
55cd8fe315 am 3e7f2b44: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '3e7f2b445875ffbbbab2e3586985a247ebaec03a':
  Move ZoneGetter into SettingsLib
 2015-05-29 19:20:49 +00:00
Geoff Mendal
9a39e08201 am d6242009: (-s ours) Import translations. DO NOT MERGE 
* commit 'd6242009d6f0754083eee1a8d9da7e89bc2d3aec':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:32 +00:00
John Spurlock
08788dccaf am 00e39238: Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev 
* commit '00e392387b8989a52e6fc66f14582ae709594852':
  Settings: Migrate zen event conditions to use calendar name.
 2015-05-29 19:18:40 +00:00
Fyodor Kupolov
1c8600b0c8 Hide the collapse/expand icon if text fits the screen 
Icon should be hidden if explanation text fits the screen, otherwise user
should be able to click the image to collapse/expand the text.

Bug: 20554398
Change-Id: I7fb06be6e6c195a5c1bcac504f4af2d67ef4211e
 2015-05-29 11:21:42 -07:00
Tony Mantler
3e7f2b4458 Merge "Move ZoneGetter into SettingsLib" into mnc-dev 2015-05-29 16:44:48 +00:00
Geoff Mendal
d6242009d6 Import translations. DO NOT MERGE 
Change-Id: I317a9af71a1ab755f032066f7239c6e1e2f6e5ec
Auto-generated-cl: translation import
 2015-05-29 09:22:09 -05:00
John Spurlock
00e392387b Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev 2015-05-29 13:22:36 +00:00
John Spurlock
bd352af3cf Settings: Migrate zen event conditions to use calendar name. 
And make sure any existing calendar value always appears in the
picker, even before it exists in the calendar provider.

Bug: 17755700
Change-Id: I8aa298a0d5804c288e2596f18c2dc7318f752121
 2015-05-28 22:20:44 -04:00
Paul Lawrence
c93ccee5e0 am a25cf52c: am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev 
* commit 'a25cf52c7ab590ab0c58d38a742f10d3d37fd63c':
  Disable back button on crypto screen
 2015-05-28 22:34:25 +00:00
Tony Mantler
550015e476 Move ZoneGetter into SettingsLib 
Change-Id: Ia998ae0bd7fc4c974e03df7c8fc380d98a3e71de
 2015-05-28 14:49:19 -07:00
Paul Lawrence
a25cf52c7a am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev 
* commit '750648c5ae2b975d7aea45601d17f4c0796e8db4':
  Disable back button on crypto screen
 2015-05-28 19:53:08 +00:00
Paul Lawrence
750648c5ae Merge "Disable back button on crypto screen" into mnc-dev 2015-05-28 19:37:28 +00:00
Jason Monk
f8adf49347 am a5c3cf40: am 7c3b9f28: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev 
* commit 'a5c3cf4003ec5314a6fe05fa355e599c80e82469':
  Make use of WifiTracker's WorkerThread support
 2015-05-28 17:30:52 +00:00
Jason Monk
a5c3cf4003 am 7c3b9f28: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev 
* commit '7c3b9f28b5b547fcdfb78d9e24f4d9b694c91c28':
  Make use of WifiTracker's WorkerThread support
 2015-05-28 16:48:46 +00:00
Jason Monk
7c3b9f28b5 Merge "Make use of WifiTracker's WorkerThread support" into mnc-dev 2015-05-28 16:37:39 +00:00
Jason Monk
7a0b412ed2 Make use of WifiTracker's WorkerThread support 
Let the AccessPoint callbacks come in on a BG thread and do more
of the handling there.

Bug: 21486080
Change-Id: I529152d9f5c429b790a669b75b6d955ce4336caf
 2015-05-28 12:26:09 -04:00
Jason Monk
eb859db14f am 5ab0c9c9: am a7fe759d: Merge "More memory updates" into mnc-dev 
* commit '5ab0c9c9e37d8ca17b2e40ccaf6913149cdd78c2':
  More memory updates
 2015-05-28 14:49:28 +00:00
John Spurlock
8bdfeadb27 am e2b5b7fd: am 9dbd6165: Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev 
* commit 'e2b5b7fd98b50f196129264c3304fca4241531a9':
  Settings: Update icon sizes for zen auto rules.
 2015-05-28 14:34:08 +00:00
Jason Monk
266fc6df94 am ef4ec260: am 15dcebe1: Help fallbacks and intent work 
* commit 'ef4ec2603270dac4b7a001220b023721ce3aab54':
  Help fallbacks and intent work
 2015-05-28 14:34:07 +00:00
Jason Monk
5ab0c9c9e3 am a7fe759d: Merge "More memory updates" into mnc-dev 
* commit 'a7fe759de7c021b0d3467c75422acb14c62f90bd':
  More memory updates
 2015-05-28 14:33:50 +00:00
Jason Monk
a7fe759de7 Merge "More memory updates" into mnc-dev 2015-05-28 14:24:35 +00:00
Jason Monk
ab2046aa76 More memory updates 
- Some string changes
 - Make processes in memory details not clickable
 - Put processes in a 'detail' category
 - Hide processes when an app only has 1
 - Add memory item to bottom of app info page

Bug: 20694769
Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8
 2015-05-28 10:20:56 -04:00
John Spurlock
e2b5b7fd98 am 9dbd6165: Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev 
* commit '9dbd616541de32df34562a4ee8cb8ee28757923c':
  Settings: Update icon sizes for zen auto rules.
 2015-05-28 14:18:41 +00:00
Jason Monk
ef4ec26032 am 15dcebe1: Help fallbacks and intent work 
* commit '15dcebe1e79ad396a08873f940e2f33d432cf387':
  Help fallbacks and intent work
 2015-05-28 14:18:38 +00:00
John Spurlock
9dbd616541 Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev 2015-05-28 14:11:10 +00:00
John Spurlock
e6f9c110c7 Settings: Update icon sizes for zen auto rules. 
Bug: 21474291
Change-Id: I5f2ec0e86f9390ee9c73e4a1be6bc280162b1cab
 2015-05-28 10:07:29 -04:00
Jason Monk
15dcebe1e7 Help fallbacks and intent work 
- Handle a backup URI, so that if the specified URI is not available,
   another can be used.
 - Add some data to help intents when they are intent URIs
 - Fill in the context with a classname when it isn't present

Bug: 15475009
Change-Id: I7050fa61121901929e650b20bd7a0ae21e8ba207
 2015-05-28 09:50:45 -04:00
The Android Automerger
5c98bd19da merge in mnc-release history after reset to mnc-dev 2015-05-28 01:05:19 -07:00
Sanket Padawe
479c5215e6 am 56eb3e61: am ecf4339b: Fix Eap method selection on screen rotation. 
* commit '56eb3e611db35afb13b00bfa7b187d2d38eae942':
  Fix Eap method selection on screen rotation.
 2015-05-28 01:32:34 +00:00
Sanket Padawe
56eb3e611d am ecf4339b: Fix Eap method selection on screen rotation. 
* commit 'ecf4339bc74f8d4fb504e8f32b1d4828e9975e37':
  Fix Eap method selection on screen rotation.
 2015-05-28 01:23:47 +00:00
Sanket Padawe
ecf4339bc7 Fix Eap method selection on screen rotation. 
Bug: 19903254
Change-Id: I84322a785f9a4121c7885ada889a04129590e4ed
 2015-05-27 18:04:23 -07:00
Paul Lawrence
177f3977dd am 70aae38d: am 90e9a903: Merge "Honor password visible setting in CryptKeeper" into mnc-dev 
* commit '70aae38d3d80bf10a60ff2216e2f31e0b93ab34c':
  Honor password visible setting in CryptKeeper
 2015-05-27 22:48:05 +00:00
Paul Lawrence
70aae38d3d am 90e9a903: Merge "Honor password visible setting in CryptKeeper" into mnc-dev 
* commit '90e9a9031215ae40c058d3c2b7474f8eb28fde44':
  Honor password visible setting in CryptKeeper
 2015-05-27 22:31:19 +00:00
Paul Lawrence
90e9a90312 Merge "Honor password visible setting in CryptKeeper" into mnc-dev 2015-05-27 22:15:51 +00:00
Adrian Roos
7581c30774 Only show emergency app preference if enabled 
Bug: 21471480
Change-Id: I93e5dcb9acb8be1220d2874d5bca764819139760
 2015-05-27 14:39:24 -07:00
Andres Morales
02122f6ab3 am fb171c21: am 27c13e5d: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev 
* commit 'fb171c214f905c20053f7ced9f981bccb8275b29':
  [ConfirmCredential] fix issue where patterns of length 4 are not checked
 2015-05-27 21:34:22 +00:00
Andres Morales
fb171c214f am 27c13e5d: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev 
* commit '27c13e5dc6444be87af26e545e4e1163c3767ffc':
  [ConfirmCredential] fix issue where patterns of length 4 are not checked
 2015-05-27 21:15:56 +00:00
Andres Morales
27c13e5dc6 Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev 2015-05-27 20:59:28 +00:00
Chad Brubaker
fdda3f5dc7 am 08ffcb99: am 227ba29e: Merge "Clear only keystore credential entires" into mnc-dev 
* commit '08ffcb996e5a54cf127e2ab87ee6689c23e0177e':
  Clear only keystore credential entires
 2015-05-27 20:45:54 +00:00
Andres Morales
6e3a182f9b am 6042133f: am b5746cb1: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev 
* commit '6042133f48b340b24babc8c590b874ddac9dfe6f':
  [LockSettings] pipe through HW throttle timeout
 2015-05-27 20:45:52 +00:00