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
Dianne Hackborn
829b9975b6
am ecffbc91
: Merge "Fix issue #17495264 : Battery history graph is bad" into lmp-dev
...
* commit 'ecffbc91b15ec558be27fd171a64ad5db9e2b7d1':
Fix issue #17495264 : Battery history graph is bad
2014-09-16 08:32:07 +00:00
Maurice Lam
0d09c6c190
am 795511ec
: [WifiSetup] Disable app starting window
...
* commit '795511ec9c952041afb158d43dd22960443b503f':
[WifiSetup] Disable app starting window
2014-09-16 08:32:06 +00:00
PauloftheWest
9b6f42b309
am f1fc7219
: am 24233660
: am 13fbd848
: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
...
* commit 'f1fc7219298b5c8dd0bf5c695f3f3942289a05df':
Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-16 08:30:51 +00:00
PauloftheWest
ec21e62a78
Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
2014-09-16 02:13:29 +00:00
Edward Jee
ac8b5b7fd6
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
...
Currently, users' preference in phonebook and call history or message
access per each Bluetooth-paired device is stored in Settings application's
shared preferences.
However, some privileged applications other than Settings need to access
such data. So we decided to migrate the data from Settings application's
shared preferences to Bluetooth application's.
Bug: 17158953
Change-Id: I44fde350ea35027df0de77feec1ea19c65f2f1c6
2014-09-16 01:25:47 +00:00
Edward Jee
b0954c1d1e
Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
2014-09-16 01:19:07 +00:00
Alexandra Gherghina
d2288753e1
am c210a3f2
: am edbfedf5
: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev
...
* commit 'c210a3f2c645ead7dee4c76662dc0da14ffb0bc1':
2014-09-15 23:55:47 +00:00
Carlos Valdivia
88c24fe1fb
am b38b1b9e
: am 690ce1b3
: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev
...
* commit 'b38b1b9ed63ed11ad845551300b0e48720dec843':
2014-09-15 23:55:46 +00:00
Jim Miller
12fb0406be
am 75c782bf
: am 1f389c19
: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev
...
* commit '75c782bf71057138375e5e11d815cde5c301e4de':
2014-09-15 23:55:45 +00:00
Alexandra Gherghina
14dfc45cdd
am ba89f50a
: am 80cd3732
: Merge "Reset Settings task when using the user switcher" into lmp-dev
...
* commit 'ba89f50ae7bf52ac7307723257cea8a3114b1a51':
2014-09-15 23:55:44 +00:00
Alexandra Gherghina
b897f8c534
am 70ad4ffd
: am dc3193ca
: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
...
* commit '70ad4ffd056c93338eb0e292fb6e675b40cb7434':
2014-09-15 23:55:43 +00:00
Amith Yamasani
e0313364bb
am 45308ef2
: am 30c50b15
: Use correct API for badging
...
* commit '45308ef25d6b10f0a96bb32bfca1bdc6bb63725d':
2014-09-15 23:55:42 +00:00
Fabrice Di Meglio
1f5bcc18d2
am 17f556c7
: am b5cc0134
: Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev
...
* commit '17f556c7081e911268d5f9ed6bdc349b6ace6c65':
2014-09-15 23:55:41 +00:00
PauloftheWest
76ddec3185
am 5437b488
: am c7fafa25
: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev
...
* commit '5437b488cb39538c2685013c0afc5ef798d3847e':
2014-09-15 23:55:40 +00:00
Barnaby James
a33056be9b
am 1299446d
: am 3c6f7a33
: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev
...
* commit '1299446dee8d928ade9d3b7f2e433dbcf153551e':
2014-09-15 23:55:39 +00:00
Amith Yamasani
21980026de
am ba790ca3
: am 91648629
: Merge "Follow API change for method name" into lmp-dev
...
* commit 'ba790ca3aceb0be89e5b0142e6a871cf2b7e03a0':
2014-09-15 23:55:38 +00:00
Svetoslav
02afa3d95d
am 9b8912db
: am fd3a3d79
: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
...
* commit '9b8912dbee4b0acd6e7cfd8920e018695074a39e':
2014-09-15 23:55:37 +00:00
Svetoslav
3e11eddfe2
am 3c0385e4
: am 527ecccc
: Merge "Update Settings due to API changes." into lmp-dev
...
* commit '3c0385e46506ecbd8694f10bc041c53695a9e8bb':
2014-09-15 23:55:36 +00:00
Jorim Jaggi
d832fa1589
am 60b7e882
: am f7cdbc3a
: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
...
* commit '60b7e88289651ce846e179f663964602f469f4b6':
2014-09-15 23:55:35 +00:00
Alexandra Gherghina
aab02b8673
am da1e8c75
: am 51712241
: Fix typo in intent filter
...
* commit 'da1e8c75fb15821e073e6da09e7b897616232b0d':
2014-09-15 23:55:34 +00:00
Alexandra Gherghina
f1f0b2567b
am 8378516b
: am 9b6ab158
: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
...
* commit '8378516b0bb4deefb68f30693f5bac2a3e1508ab':
2014-09-15 23:55:32 +00:00
Dan Sandler
d1234c882f
am 6f0507ad
: am 8aed3e3f
: Only fetch titles of ringtones coming from the MediaStore.
...
* commit '6f0507add78fe79212b8408651be74e59f7c9dfa':
2014-09-15 23:55:32 +00:00
Wink Saville
91a69d353f
am 0e559d53
: am aa188b53
: Merge "More cleanup prior to unhiding" into lmp-dev
...
* commit '0e559d532c7cce810caa06ec6b69638e608b5998':
2014-09-15 23:55:31 +00:00
Fabrice Di Meglio
3ef7e17bec
am a1c6288b
: am 0535ed55
: Merge "Fix bug #17393417 Developer Options are not indexed after activating them" into lmp-dev
...
* commit 'a1c6288b137e4babbf1da3bc3a573a106e7a939d':
2014-09-15 23:55:30 +00:00
PauloftheWest
dd476d1629
am 4cebc121
: am 4a1b7b5f
: Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev
...
* commit '4cebc121506129eda1a6222bc19469956256643d':
2014-09-15 23:55:29 +00:00
Chris Wren
f686a1fd26
am 2ed0ea21
: am 0a59607e
: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
...
* commit '2ed0ea2120d8356126f614655701382d1bf2a0fb':
2014-09-15 23:55:28 +00:00
Fabrice Di Meglio
5ae5557e51
am f475cfa3
: am ed1175cf
: Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev
...
* commit 'f475cfa354f478dd8ad5779ce9e04c551e4bc3ed':
2014-09-15 23:55:27 +00:00
Andres Morales
02655776a0
am db9745e4
: am 5c9a3b0d
: Merge "New black drawables for tap and pay" into lmp-dev
...
* commit 'db9745e43a416afb6a52ff89013c2353c812faee':
2014-09-15 23:55:26 +00:00
Andres Morales
311244539a
am d5723235
: am 1c09186d
: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
...
* commit 'd572323580c0eabb59e9d63f4f3c58f1aa32c71b':
2014-09-15 23:55:25 +00:00
Baligh Uddin
2a106e2e93
am 19843ad1
: (-s ours) am 87c7cec8
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '19843ad15e5b461ffb061c2c9478054f4cde70da':
2014-09-15 23:55:24 +00:00
Baligh Uddin
3b2d25707a
am 184a7b4f
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '184a7b4fd367a3d372efabc9aaf369b6ab8504d1':
Import translations. DO NOT MERGE
2014-09-15 23:55:23 +00:00
PauloftheWest
0bc56b9c03
am 357e2826
: am 0e73c521
: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
...
* commit '357e2826e166821e489607e9ae4006fed19cf57a':
2014-09-15 23:55:22 +00:00
PauloftheWest
fe0bf29ce5
am 0410a1e3
: am 92de681e
: Merge "Fix the truncating of Bluetooth icons." into lmp-dev
...
* commit '0410a1e327f5276cc600ebda87ee0983f94b3891':
2014-09-15 23:55:21 +00:00
Fabrice Di Meglio
32434f0b63
am e758df57
: am 5a8a75d9
: Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev
...
* commit 'e758df576a099920e00ec360267439b4a719c2ad':
2014-09-15 23:55:20 +00:00
Chris Wren
d351676e31
am dd95e098
: am ee846f88
: missing dep. Revert "Implement per-app sensitivity settings toggle."
...
* commit 'dd95e098f4e2b8d361df19964ab1ca6701840882':
2014-09-15 23:55:19 +00:00
Chris Wren
19f50c2e56
am cec40645
: am 77fdc93b
: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
...
* commit 'cec406455239e26056687813dbdefcd9ceafa783':
2014-09-15 23:55:19 +00:00
Dan Sandler
5d29c6603e
am 84176e56
: am feec34ce
: Merge "Don\'t block notifications from system packages." into lmp-dev
...
* commit '84176e5691055d416bc6770704b00f2925a98318':
2014-09-15 23:55:16 +00:00
PauloftheWest
fed937f07a
am 75b8535f
: am e1a164bf
: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev
...
* commit '75b8535f7d7329e3b3bf2743987abae850795845':
2014-09-15 23:55:15 +00:00
Zoltan Szatmary-Ban
d35829bcb3
am 34e537ed
: am c91d2cd0
: Merge "Put VPN settings under primary profile control" into lmp-dev
...
* commit '34e537ed277415530c4a811bfcd9a27a3f17bd00':
2014-09-15 23:55:14 +00:00
Zoltan Szatmary-Ban
be146343e4
am 4c035b8f
: am 1e0ea452
: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev
...
* commit '4c035b8fe4618322d0332b92e6bc4c6e1d8f8cfb':
2014-09-15 23:55:13 +00:00
Alexandra Gherghina
131d34aecd
am c24310c9
: am 9dce0791
: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev
...
* commit 'c24310c9638c972f7757b1f2356383730129fac6':
2014-09-15 23:55:07 +00:00