Commit Graph

16434 Commits

Author SHA1 Message Date
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
9e7073aeb9 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:31:59 +00:00
Edward Jee
c64a51cb60 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:31:59 +00:00
Edward Jee
299faadbfc 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:31:58 +00:00
PauloftheWest
99f7d73b47 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:31:57 +00:00
Dianne Hackborn
9e4b526951 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:31:56 +00:00
Dianne Hackborn
ebcba9dca7 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:31:55 +00:00
Maurice Lam
95b283aabd am 795511ec: [WifiSetup] Disable app starting window
* commit '795511ec9c952041afb158d43dd22960443b503f':
  [WifiSetup] Disable app starting window
2014-09-16 08:31:54 +00:00
PauloftheWest
9de624d837 am 7b03a452: am dc985292: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
* commit '7b03a45227a304b9407e565994c491dbee64e4cd':
  Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-16 08:29:09 +00:00
Vinit Deshpande
e2c1d504fc Fix automatic Wi-fi toggle
It is happening because there previous view doesn't disconnect
itself from setting change; and then two views alternatively
enable/disable wifi.

Bug: 17157005

Change-Id: I42916a7bbd735960a26efbae670c9b927ec8574d
2014-09-15 20:18:35 -07: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
PauloftheWest
771fd894b7 am 56b3f338: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
* commit '56b3f338e7bc85d30f56eafce4d6d0dc2dd46e3b':
2014-09-15 23:56:07 +00:00
Amith Yamasani
9c5104e610 am b8931381: am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev
* commit 'b89313812dbefe68ac48b06e3ca9c603c42cae1c':
2014-09-15 23:56:06 +00:00
Adam Lesinski
53a09c2711 am 98739309: am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
* commit '98739309e15e1437f15d92872712fe05ba29a4dc':
2014-09-15 23:56:05 +00:00
PauloftheWest
c8733c8a18 am 4cf6dcf6: am 29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev
* commit '4cf6dcf6aff003cc4d294275209cb3987c07775f':
2014-09-15 23:56:04 +00:00
Zoltan Szatmary-Ban
e692ec6a12 am dbcfc1b7: am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev
* commit 'dbcfc1b73678e53bf89d11c5c4fe47a74f4508a7':
2014-09-15 23:56:03 +00:00
Elliott Hughes
1625fd5ac9 am bce031b0: am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
* commit 'bce031b0ad16c0ba127627ca7231d872d23ce9c3':
2014-09-15 23:56:00 +00:00
PauloftheWest
45a14bb239 am 5dcec205: am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
* commit '5dcec20557353a79aaa97e113583507b4f1a7433':
2014-09-15 23:55:59 +00:00
PauloftheWest
ca5ea573d7 am 91f76560: am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
* commit '91f76560f80f006ce704f80f21400d91ffe43e89':
2014-09-15 23:55:58 +00:00
PauloftheWest
644a9f8130 am 9128659b: am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
* commit '9128659be872890927291c30df781d3522d34a1e':
2014-09-15 23:55:57 +00:00
Andres Morales
096efb6b67 am a40a9a90: am 4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
* commit 'a40a9a90b33fc3c51f08b03503354ab0e90ac0c2':
2014-09-15 23:55:51 +00:00
PauloftheWest
7ea894eada am 5c86c955: am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
* commit '5c86c9551388e85b172a8305a0e9dd79ef025785':
2014-09-15 23:55:50 +00:00
Alan Viverette
71135c4f10 am ce7c0337: am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
* commit 'ce7c0337202bbf063a50e6436c246b35949ae0c3':
2014-09-15 23:55:49 +00:00
vandwalle
665bf2bf6a am 4d5ddf0c: am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev
* commit '4d5ddf0cce5cd5cafb5b23e3289a279c7540abca':
2014-09-15 23:55:48 +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