Commit Graph

16154 Commits

Author SHA1 Message Date
Dianne Hackborn
be46e2a4bd am 5df5798e: am 6d9988e7: am ebcba9dc: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev
* commit '5df5798e619a9a73946c4b0ce61cd366e5a9f90b':
  Fix issue #17495264: Battery history graph is bad
2014-09-17 05:13:00 +00:00
Maurice Lam
b3f7de50ab am 9bfbf642: am 24956de0: am 95b283aa: am 795511ec: [WifiSetup] Disable app starting window
* commit '9bfbf6426bff4c7b8b074f0701dbf539b6c34b51':
  [WifiSetup] Disable app starting window
2014-09-17 05:12:58 +00:00
PauloftheWest
effc8f52af am 9de624d8: am 7b03a452: am dc985292: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
* commit '9de624d837513b4650f973d609006b03140f5507':
  Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-16 21:03:12 +00:00
Prem Kumar
24bfab6f23 am 02f66ba7: am 07e5ea99: am 319e7a27: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
* commit '02f66ba78c67567275fca7fd994a9d3df023befe':
2014-09-16 20:32:54 +00:00
John Spurlock
6770d06345 am c9f6945f: am be0827dd: am f97ec546: am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
* commit 'c9f6945fc80511de36c6e7029b49a0d322b9aaa5':
2014-09-16 20:31:48 +00:00
Tyler Gunn
0c07932111 am 2b3505ed: am 8bad5a2d: am 86e452f9: am 3e71b197: Renaming Telecomm to Telecom.
* commit '2b3505edb2884f3b69cf805486ecfefe83992172':
2014-09-16 20:29:45 +00:00
Dianne Hackborn
5df5798e61 am 6d9988e7: am ebcba9dc: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev
* commit '6d9988e79ec5b8d1480f50e45fe58e358574115b':
  Fix issue #17495264: Battery history graph is bad
2014-09-16 17:18:13 +00:00
Maurice Lam
9bfbf6426b am 24956de0: am 95b283aa: am 795511ec: [WifiSetup] Disable app starting window
* commit '24956de0e0405ee3165d289ce74a87e70855b46b':
  [WifiSetup] Disable app starting window
2014-09-16 17:18:12 +00:00
Dianne Hackborn
6d9988e79e am ebcba9dc: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev
* commit 'ebcba9dca7290cf1e4f1d263408f1af98b89a853':
  Fix issue #17495264: Battery history graph is bad
2014-09-16 16:47:31 +00:00
Maurice Lam
24956de0e0 am 95b283aa: am 795511ec: [WifiSetup] Disable app starting window
* commit '95b283aabd26a757bc80abf6beff36346d15b20b':
  [WifiSetup] Disable app starting window
2014-09-16 16:47:30 +00:00
Paul Lawrence
158a291f63 am 36d8bd3b: am db51c76a: am 7f4c4fb5: am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '36d8bd3bf7267f38af9f53be7bce70d93b5f3bfa':
2014-09-16 15:21:16 +00:00
Kenny Guy
9d266fb852 am daa4a466: am 28d2fa62: am 1ede808c: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit 'daa4a46633cc1175a8dcb3a60fe968d088dee377':
2014-09-16 15:21:15 +00:00
Alexandra Gherghina
6042208720 am 7a09535c: am cd321d81: am 69af2c6a: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
* commit '7a09535c734cb9da9dcf66bef8b5265f0f65882a':
2014-09-16 15:21:14 +00:00
PauloftheWest
8d8c566934 am e438c383: am 6c1d69ba: am 9f96ac6f: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit 'e438c38323f9e3132110ab561235b766d5e800c0':
2014-09-16 15:21:13 +00:00
Dianne Hackborn
1d463fb1e1 am f7acc1b3: am c857cddf: am 364ca371: am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
* commit 'f7acc1b3115bee7536804ee77579eb213db67525':
2014-09-16 15:21:12 +00:00
Svetoslav
c73b179d59 am 0a91a8d2: am c33aef20: am c50841ca: am 85dcef12: Fix settings crash in print job screen.
* commit '0a91a8d24dd7098d31410f14a36067a7fe963ff4':
2014-09-16 15:21:11 +00:00
Vinit Deshpande
7ae64011ad am 84912814: am 7aaccec0: am c471629c: am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
* commit '84912814f50934ddb8e6c968d829a00873037bb2':
2014-09-16 15:21:10 +00:00
Svetoslav
3ade85ec73 am 9af0fce6: am 536cb798: am 842e9d04: am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
* commit '9af0fce66a9262c5563a588dbc998f451ca40469':
2014-09-16 15:21:09 +00:00
Carlos Valdivia
afc3276323 am 4806e47d: am 456fbe88: am a8627dd8: am f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '4806e47d55ff4797ba2a93c1f94414219d5358cb':
2014-09-16 15:21:08 +00:00
Baligh Uddin
6849828060 am 2dd62886: (-s ours) am f053f532: (-s ours) am a2e918af: (-s ours) am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '2dd62886faea7b923aa1abaf4e5e7b681c400ba7':
2014-09-16 15:21:08 +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
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
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