PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,740 Commits 1 Branch 0 Tags
e9f080e5b10924a478abf28e1decb76e3d41fe6e
Commit Graph

16740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
ae2da7a90b am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev 
* commit '69b674656af869219189fe0f7985c011d29d9b7e':
  Don't allow creating a guest from a secondary user...
 2014-09-17 20:16:43 +00:00
Amith Yamasani
69b674656a Merge "Don't allow creating a guest from a secondary user..." into lmp-dev 2014-09-17 20:06:59 +00:00
John Spurlock
4f6d252050 am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev 
* commit 'ab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0':
  Settings: Ensure CryptKeeper dismisses secure keyguards.
 2014-09-17 19:59:34 +00:00
John Spurlock
ab4fe2d94f am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev 
* commit '9e51261dcc5db11be92660a3bde6b1f1e59ee128':
  Settings: Ensure CryptKeeper dismisses secure keyguards.
 2014-09-17 19:53:54 +00:00
John Spurlock
9e51261dcc am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev 
* commit 'ae9d437b4ab8dc98c347e4218390a38900979faa':
  Settings: Ensure CryptKeeper dismisses secure keyguards.
 2014-09-17 19:48:11 +00:00
John Spurlock
ae9d437b4a Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev 2014-09-17 19:37:27 +00:00
PauloftheWest
13a63ef39b am 63f9500e: am 08183704: am 3cc81aea: Increase char limit for translation. 
* commit '63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e':
  Increase char limit for translation.
 2014-09-17 18:49:59 +00:00
PauloftheWest
63f9500e0d am 08183704: am 3cc81aea: Increase char limit for translation. 
* commit '0818370405da62d427620da5407ca4c5f9c969a0':
  Increase char limit for translation.
 2014-09-17 18:41:09 +00:00
PauloftheWest
0818370405 am 3cc81aea: Increase char limit for translation. 
* commit '3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb':
  Increase char limit for translation.
 2014-09-17 18:30:12 +00:00
John Spurlock
2c52651577 Settings: Ensure CryptKeeper dismisses secure keyguards. 
Otherwise, the lockscreen can be shown during the decryption
challenge, which hides the challenge activity window until
the next reboot.

Bug:17512377
Change-Id: Idb6b5b3dddb3cf2dc70b784413ea310c401880af
 2014-09-17 13:33:38 -04:00
PauloftheWest
3cc81aeabf Increase char limit for translation. 
Bug: 17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
 2014-09-17 08:30:09 -07:00
Amith Yamasani
f5d14b2aed Don't allow creating a guest from a secondary user... 
unless the primary user has allowed Guest and user creation from
lockscreen.

Bug: 17482220
Change-Id: Idd05889da330d6cbe0d3ccab2e98abfdeba94b96
 2014-09-16 16:36:40 -07:00
Maurice Lam
b4f5e0bd61 am 2ffb10d2: am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit '2ffb10d28bd1945004bd29390803a81ce5bf3338':
  [WifiSetup] Update connection state for auto-finish
 2014-09-16 19:44:14 +00:00
Maurice Lam
2ffb10d28b am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit 'fd4e0f2567c97c71615d8defc3b12ed51ce77c05':
  [WifiSetup] Update connection state for auto-finish
 2014-09-16 19:36:47 +00:00
Maurice Lam
fd4e0f2567 am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit '27d74fa288c195aa5e1190da5599965472f1aded':
  [WifiSetup] Update connection state for auto-finish
 2014-09-16 18:47:07 +00:00
Maurice Lam
27d74fa288 Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 2014-09-16 18:35:39 +00:00
Baligh Uddin
072f390b58 am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'fbb0218a117df5537f6ef2835a673ef485e1cdb1':
  Import translations. DO NOT MERGE
 2014-09-16 18:22:37 +00:00
Maurice Lam
610fdf3343 [WifiSetup] Update connection state for auto-finish 
In Wi-Fi setup, when the connection state changed, query
ConnectivityManager for the latest Wi-Fi connection state instead of
relying the NetworkInfo attached in the intent, because the first
network info upon changing AP still shows the network as connected.

Bug: 17511772
Change-Id: I9c7765086dc8fbc5e1c2a37124ca89db3eab04a3
 2014-09-16 11:05:28 -07:00
Baligh Uddin
fbb0218a11 am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '1741abb95c2a30cd10ba829aca345b3d919f3ef6':
  Import translations. DO NOT MERGE
 2014-09-16 18:03:21 +00:00
Baligh Uddin
1741abb95c am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '09a11d5bf4c42a7cd2eac4469933109a29f5bb68':
  Import translations. DO NOT MERGE
 2014-09-16 15:26:42 +00:00
Dan Sandler
d446e4750a am fecd8989: am 99e467a7: am e98bee54: am 1fb51987: Merge "Show a better list of apps." into lmp-dev 
* commit 'fecd8989854aaf09fd5f761ac863e116534e9177':
 2014-09-16 15:21:07 +00:00
Zoltan Szatmary-Ban
f51abf9a64 am bc8f3d08: am 118cf516: am 55cd479d: am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev 
* commit 'bc8f3d08d7572ebf51976806d7c1ad6f02cf3352':
 2014-09-16 15:21:06 +00:00
Zoltan Szatmary-Ban
5b792c6b81 am 23496243: am b2259b3a: am b46eeeb7: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev 
* commit '2349624368f4e3fd1e2d6ec6fee2122354aa1a14':
 2014-09-16 15:21:05 +00:00
Fabrice Di Meglio
5b871c7630 am 88ff5747: am a2bba88b: am b88d24df: am f8310c18: Merge "Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released" into lmp-dev 
* commit '88ff5747b67df59fd623b177a06bce86b5031fb8':
 2014-09-16 15:21:04 +00:00
PauloftheWest
a90713df31 am 08455c57: am c1806600: am 23d0ac44: am b2197d90: Added bluetooth_device_settings_header to fix build breakage. 
* commit '08455c5791f706f8d55cd08a96375a209597d5d5':
 2014-09-16 15:21:03 +00:00
Jim Miller
c31f561581 am 0787af48: am 825eb63c: am f496ae94: am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev 
* commit '0787af48c7efa96ba3fa5a44b8686428e9f020a6':
 2014-09-16 15:21:02 +00:00
Baligh Uddin
abc05267d2 am c742cfc7: (-s ours) am 6f96fcc5: (-s ours) am 321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'c742cfc716bba4ee2bd6dbe62a42d182baa4b6bd':
  Import translations. DO NOT MERGE
 2014-09-16 15:21:01 +00:00
PauloftheWest
4e7ebb3326 am 52e19465: am 1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev 
* commit '52e1946554a45b6034bcf23ed46f3033fe843129':
 2014-09-16 15:21:00 +00:00
John Spurlock
f4ca7697d8 am 315e0a4a: am 31915522: Settings: Remove fixed dropdown width from "From" pref. 
* commit '315e0a4a9e0a87972f7e5e8e850a226bdf90d83a':
 2014-09-16 15:20:59 +00:00
PauloftheWest
ab9fe9d3e6 am 4708092e: am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev 
* commit '4708092e4f1b9538ddd8e3fc797ad184eea78233':
 2014-09-16 15:20:58 +00:00
Jason Monk
aef243e64e am c80014fb: am 062f736c: Adding zen mode condition dialog 
* commit 'c80014fbbbfbefaab96aeffd9dd585801bd8d0e9':
 2014-09-16 15:20:57 +00:00
Fabrice Di Meglio
315ae7930d am 743400b4: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev 
* commit '743400b466ad6459fe01a35596bf7478695cee57':
 2014-09-16 15:20:56 +00:00
John Spurlock
0c91e31da8 am 417b8261: am 1e7dbd45: Settings: Use the same day sequence for downtime. 
* commit '417b826176e1b88ef640518eaed639726a84e9ec':
 2014-09-16 15:20:55 +00:00
John Spurlock
0ea17d3b05 am 0ed4f5b7: am cddb2954: Settings: Make downtime days scrollable. 
* commit '0ed4f5b7b122f98a37c0cd1de0de9ccc55795a14':
 2014-09-16 15:20:54 +00:00
Matthew Xie
1b80bbc7bb am a5d4c1b2: am 72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev 
* commit 'a5d4c1b2be158f08c0363dc7339d01b5845fd5bc':
 2014-09-16 15:20:52 +00:00
Carlos Valdivia
418c900f94 am cece1cb2: am af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev 
* commit 'cece1cb20899394cd1710f5d02aa7fdacedaf653':
 2014-09-16 15:20:51 +00:00
Elliott Hughes
0541c7ab1b am 6312a721: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev 
* commit '6312a72136458287c467a224bb6e19ac9eedb203':
 2014-09-16 15:20:50 +00:00
Jorim Jaggi
8e73e6c436 am 723abba6: am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev 
* commit '723abba6c5315390cfdada773987d9522b7b1038':
 2014-09-16 15:20:48 +00:00
Baligh Uddin
09a11d5bf4 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:16:37 +00:00
PauloftheWest
79c32a04b5 am d1cd913a: am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit 'd1cd913a6e1dc35da4d5e0c1fc4b48a0e382d486':
  Alignment updates for Wi-Fi Settings dialog.
 2014-09-16 09:07:08 +00:00
Edward Jee
1386bd9873 am 000dd0a6: am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth. 
* commit '000dd0a6b24a8c383a2051201699bd2c93bc4159':
  Migrates PBAP and MAP access permission data from Settings to Bluetooth.
 2014-09-16 09:07:07 +00:00
Edward Jee
170be5c8c8 am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 09:07:06 +00:00
PauloftheWest
88f7fa0b9e am 8dee66d1: am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '8dee66d1248af1aa28b32d11b1b3160ab3a79437':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 09:07:05 +00:00
Dianne Hackborn
1e6b685828 am 2acec676: am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit '2acec6768fc67516eff484f6d4f8de607a597a60':
  Little more on issue #17495264: tweak when we ignore initial times.
 2014-09-16 09:07:04 +00:00
Dianne Hackborn
0f4c5f15a0 am ff966f2a: am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 
* commit 'ff966f2a82044bed1d9d791be9aa0c30c8bb26cc':
  Fix issue #17495264: Battery history graph is bad
 2014-09-16 09:07:03 +00:00
Maurice Lam
e1300a2c9b am ea8db10a: am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window 
* commit 'ea8db10ac8fc3aafd7834c401aacf7245b244936':
  [WifiSetup] Disable app starting window
 2014-09-16 09:07:02 +00:00
PauloftheWest
d1cd913a6e am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit '9007cf6369eee6179082de8c769da6cad4906831':
  Alignment updates for Wi-Fi Settings dialog.
 2014-09-16 08:52:57 +00:00
Edward Jee
000dd0a6b2 am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth. 
* commit 'a99ef8871e204a04bc2b6436eede2078f8001b98':
  Migrates PBAP and MAP access permission data from Settings to Bluetooth.
 2014-09-16 08:52:57 +00:00
Edward Jee
32c56ed434 am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '50b6eec908fa76dfe426016d621cda3b013846b1':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 08:52:55 +00:00
PauloftheWest
8dee66d124 am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '720af58039c31bbf9f239600a898202b971987f5':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 08:52:54 +00:00