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

16463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sander Alewijnse
61fc506eb3 am 0fe16796: am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '0fe16796c55091ed7b75f75fdeed5b0e5b03da30':
  Update targetSdkVersion check.
 2014-09-18 12:07:39 +00:00
Sander Alewijnse
0fe16796c5 am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit 'c995e73391bb4f46154d506f198ee4dec85bae4c':
  Update targetSdkVersion check.
 2014-09-18 11:56:32 +00:00
Sander Alewijnse
c995e73391 am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '4241b0a9627e424adb897ec894a34ddce8fd77e3':
  Update targetSdkVersion check.
 2014-09-18 11:46:11 +00:00
Sander Alewijnse
4241b0a962 Merge "Update targetSdkVersion check." into lmp-dev 2014-09-18 11:36:31 +00:00
Mark Salyzyn
0e77a346bb am 22955813: am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support 
* commit '229558137318fdebce6b1bf3f5b30ea96e65a400':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:46:59 +00:00
Mark Salyzyn
2295581373 am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support 
* commit '5f288bc17c79c76090075db3a8a307c6421b9eb0':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:32:07 +00:00
Mark Salyzyn
5f288bc17c am 894af268: logd: settings: ro.config.low_ram support 
* commit '894af268def8a817306ea83f21cb25b6f0edf2e3':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:25:57 +00:00
Mark Salyzyn
894af268de logd: settings: ro.config.low_ram support 
- limit settings to 64K, 256K and 1M if ro.config.low_ram true
- Correctly handle ro.logd.size

Bug: 17526187
Change-Id: I2380b649516b29c2a98f54de18e5a4780b3421ce
 2014-09-17 22:26:16 +00:00
Amith Yamasani
aeec54f71d am 2f8b4173: am ae2da7a9: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev 
* commit '2f8b4173581bb7a7421f6c49dee236cdebc66aaf':
  Don't allow creating a guest from a secondary user...
 2014-09-17 20:38:49 +00:00
Amith Yamasani
2f8b417358 am ae2da7a9: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev 
* commit 'ae2da7a90bd9dad3522611f1f105788e1d11fe81':
  Don't allow creating a guest from a secondary user...
 2014-09-17 20:28:06 +00:00
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
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
Dianne Hackborn
2acec6768f am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit 'bf4ecab3ebf691dec8c2734f3dce9a547ea32ad5':
  Little more on issue #17495264: tweak when we ignore initial times.
 2014-09-16 08:52:53 +00:00
Dianne Hackborn
ff966f2a82 am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 
* commit '829b9975b682fcc2c2404fa1ec7397ee5d4cfcae':
  Fix issue #17495264: Battery history graph is bad
 2014-09-16 08:52:52 +00:00
Maurice Lam
ea8db10ac8 am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window 
* commit '0d09c6c190436ffc28dd9c04af1a1e7aa203463c':
  [WifiSetup] Disable app starting window
 2014-09-16 08:52:51 +00:00
PauloftheWest
9007cf6369 am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit 'ec21e62a78d98dfb22faeb8bd27ac07061ae83a3':
  Alignment updates for Wi-Fi Settings dialog.
 2014-09-16 08:32:12 +00:00
Edward Jee
a99ef8871e am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth. 
* commit 'ac8b5b7fd6b6774d22d39bb9a4becca1908915c7':
  Migrates PBAP and MAP access permission data from Settings to Bluetooth.
 2014-09-16 08:32:11 +00:00
Edward Jee
50b6eec908 am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit 'b0954c1d1e02958fd357cae11613f4539fbe270a':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 08:32:10 +00:00
PauloftheWest
720af58039 am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '0ca0c8ad20e5c630c62bc83e53b8d552a35a3e90':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 08:32:09 +00:00
Dianne Hackborn
bf4ecab3eb am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit '94aae9afd18c17848aed68addd19d93c937c7555':
  Little more on issue #17495264: tweak when we ignore initial times.
 2014-09-16 08:32:08 +00:00