OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 am: 2d38abb49a
xiaocheng.x.wang [Fri, 9 Dec 2016 21:08:45 +0000 (21:08 +0000)]
Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 am: 2d38abb49a
am: 2366d4dcfd

Change-Id: If27c734d231abbc76d21ac6efcab3933fe34f460

7 years agoMerge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116
xiaocheng.x.wang [Fri, 9 Dec 2016 21:02:45 +0000 (21:02 +0000)]
Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116
am: 2d38abb49a

Change-Id: Ic105a97e7ee4d56f16dc8f67d2b09a6ebd55b3ba

7 years agoMerge "Fix apn can't be updated when pressing back key"
xiaocheng.x.wang [Fri, 9 Dec 2016 20:57:46 +0000 (20:57 +0000)]
Merge "Fix apn can't be updated when pressing back key"
am: 5c6e7a2116

Change-Id: I5f7cf29476e88c3603c902c5e501bef08fad5c8c

7 years agoMerge "Fix apn can't be updated when pressing back key"
Treehugger Robot [Fri, 9 Dec 2016 20:50:39 +0000 (20:50 +0000)]
Merge "Fix apn can't be updated when pressing back key"

7 years agoMove private volume storage calculations into a shared lib.
Daniel Nishi [Thu, 8 Dec 2016 00:50:11 +0000 (00:50 +0000)]
Move private volume storage calculations into a shared lib.
am: c04f8b9ecd

Change-Id: If2822dfcebf95546c0fa2ee96d3e689e104f3d59

7 years agoImport translations. DO NOT MERGE am: 5a05a8a4ea -s ours
Bill Yi [Thu, 1 Dec 2016 19:13:45 +0000 (19:13 +0000)]
Import translations. DO NOT MERGE am: 5a05a8a4ea  -s ours
am: f131815859  -s ours

Change-Id: I3d20b9cf6c05d4f4770790336ecffcc53eebe11e

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 1 Dec 2016 19:07:44 +0000 (19:07 +0000)]
Import translations. DO NOT MERGE
am: 5a05a8a4ea  -s ours

Change-Id: Ia227c18a81391b0609518b9a68001598bd389191

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 1 Dec 2016 18:11:25 +0000 (10:11 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ib08dd2e3c6b87cc0fbdc16bb167f4e167e52b020

7 years agoMerge "Refactor NetworkScoreAppManager for testing." am: 512368a22e am: 3140bb5ace
Amin Shaikh [Thu, 1 Dec 2016 02:27:02 +0000 (02:27 +0000)]
Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e am: 3140bb5ace
am: 7c8af0aedc

Change-Id: I08804d0672ee723f0e6b1278972613a4f11f479d

7 years agoMerge "Refactor NetworkScoreAppManager for testing." am: 512368a22e
Amin Shaikh [Thu, 1 Dec 2016 02:21:13 +0000 (02:21 +0000)]
Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e
am: 3140bb5ace

Change-Id: I61fa13f1537465bf61ec65183d3844b2a2ffd001

7 years agoMerge "Refactor NetworkScoreAppManager for testing."
Amin Shaikh [Thu, 1 Dec 2016 02:11:06 +0000 (02:11 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
am: 512368a22e

Change-Id: I597c960d5e56014b23b280e1e73e324efa77f8fb

7 years agoMerge "Refactor NetworkScoreAppManager for testing."
Treehugger Robot [Thu, 1 Dec 2016 01:59:13 +0000 (01:59 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."

7 years agoMerge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5 am...
Stephen Chen [Thu, 1 Dec 2016 00:13:50 +0000 (00:13 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5 am: 539eaa34d5
am: 701e558586

Change-Id: I0a5dd13992a450a04417bdc703781fb2d4c79055

7 years agoMerge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5
Stephen Chen [Thu, 1 Dec 2016 00:09:32 +0000 (00:09 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5
am: 539eaa34d5

Change-Id: I32a45ccc9a08d8f90e8801f727853fc320db9dc5

7 years agoMerge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
Stephen Chen [Wed, 30 Nov 2016 23:59:43 +0000 (23:59 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
am: 666c9d7ea5

Change-Id: I1b193660453cbc492d83501f8e9fe3b544e6e4b2

7 years agoMerge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
Treehugger Robot [Wed, 30 Nov 2016 20:25:12 +0000 (20:25 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."

7 years agoRefactor NetworkScoreAppManager for testing.
Amin Shaikh [Tue, 22 Nov 2016 01:28:47 +0000 (17:28 -0800)]
Refactor NetworkScoreAppManager for testing.

Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44

7 years agoLink WIFI_SAVED_NETWORK_SETTINGS action with activity.
Stephen Chen [Tue, 15 Nov 2016 00:24:08 +0000 (16:24 -0800)]
Link WIFI_SAVED_NETWORK_SETTINGS action with activity.

Bug: 32738882
Test: gts test
Change-Id: Ie92e55fd1b0fbb7ba90b3f378a888b098dcf3287

7 years agoMove private volume storage calculations into a shared lib.
Daniel Nishi [Mon, 19 Sep 2016 19:16:21 +0000 (12:16 -0700)]
Move private volume storage calculations into a shared lib.

Bug: 30895163
Test: m RunStorageManagerRoboTests
Change-Id: I3e464c8b721373ebc1527eb5411622c69bf587d1

7 years agoFix crash when opening account sync detail for external app am: c9cdc25f41 am: f3e86ca481
Fan Zhang [Wed, 23 Nov 2016 23:45:30 +0000 (23:45 +0000)]
Fix crash when opening account sync detail for external app am: c9cdc25f41 am: f3e86ca481
am: b69ec294c2

Change-Id: I2c195509e31812f55b00a1ecc6bc1cdead3f90f4

7 years agoImport translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours...
Bill Yi [Wed, 23 Nov 2016 23:45:18 +0000 (23:45 +0000)]
Import translations. DO NOT MERGE am: bb6af9902d  -s ours am: 061b294714  -s ours am: 4666b50754  -s ours
am: 5cca5a64e8  -s ours

Change-Id: Ic72803a51ba93c56254173c8f428fb9a146bdc1a

7 years agoImport translations. DO NOT MERGE am: e7f9b0b30b -s ours am: f8b4927683 -s ours
Bill Yi [Wed, 23 Nov 2016 23:45:05 +0000 (23:45 +0000)]
Import translations. DO NOT MERGE am: e7f9b0b30b  -s ours am: f8b4927683  -s ours
am: 57b56329f3  -s ours

Change-Id: I1d86bc055b65520c41615ddf919c64890f1b653f

7 years agoNexus imprint setting is missing while adding corp account from SUW am: 378dec1495...
Steven Ng [Wed, 23 Nov 2016 23:44:53 +0000 (23:44 +0000)]
Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495 am: 046a63450f
am: 26a3c28735

Change-Id: I490619e028e67635fbd97b9537e3f8435471c0b0

7 years agoImport translations. DO NOT MERGE am: a6d9842695 -s ours am: c027907edc -s ours...
Bill Yi [Wed, 23 Nov 2016 23:44:38 +0000 (23:44 +0000)]
Import translations. DO NOT MERGE am: a6d9842695  -s ours am: c027907edc  -s ours am: f8032d0b15  -s ours
am: 71a0bb85a5  -s ours

Change-Id: I306a02fc5ca3330732fde9e8439b12e8a5f55389

7 years agoImport translations. DO NOT MERGE am: 475763d01c -s ours am: 9a22968ff8 -s ours
Bill Yi [Wed, 23 Nov 2016 23:44:25 +0000 (23:44 +0000)]
Import translations. DO NOT MERGE am: 475763d01c  -s ours am: 9a22968ff8  -s ours
am: 88b043714b  -s ours

Change-Id: I733c0d9fc99ffe62dc43ff32e0d9067ab2e1fa23

7 years agoFix crash when opening account sync detail for external app am: c9cdc25f41
Fan Zhang [Wed, 23 Nov 2016 23:29:22 +0000 (23:29 +0000)]
Fix crash when opening account sync detail for external app am: c9cdc25f41
am: f3e86ca481

Change-Id: I1ba3f6f34e010b95e1a86d6272c82adcee72117a

7 years agoImport translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours
Bill Yi [Wed, 23 Nov 2016 23:29:07 +0000 (23:29 +0000)]
Import translations. DO NOT MERGE am: bb6af9902d  -s ours am: 061b294714  -s ours
am: 4666b50754  -s ours

Change-Id: I1aaca58936606507f763770e65dace147da5153a

7 years agoImport translations. DO NOT MERGE am: e7f9b0b30b -s ours
Bill Yi [Wed, 23 Nov 2016 23:28:53 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am: e7f9b0b30b  -s ours
am: f8b4927683  -s ours

Change-Id: I4be07f881fd515c3668c12ecab6d2af8452d1ec0

7 years agoNexus imprint setting is missing while adding corp account from SUW am: 378dec1495
Steven Ng [Wed, 23 Nov 2016 23:28:38 +0000 (23:28 +0000)]
Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495
am: 046a63450f

Change-Id: I7cbb27a7aa4a1d42dce52ef998ffe79aaa322ab4

7 years agoImport translations. DO NOT MERGE am: a6d9842695 -s ours am: c027907edc -s ours
Bill Yi [Wed, 23 Nov 2016 23:28:25 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am: a6d9842695  -s ours am: c027907edc  -s ours
am: f8032d0b15  -s ours

Change-Id: I0c7f588a8868df3a7235dbbac1eff725dc591070

7 years agoImport translations. DO NOT MERGE am: 475763d01c -s ours
Bill Yi [Wed, 23 Nov 2016 23:28:12 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am: 475763d01c  -s ours
am: 9a22968ff8  -s ours

Change-Id: Ic98ab45a4b2e31007a18e7018ad5f31c2b82d2ae

7 years agoImport translations. DO NOT MERGE am: 001632d55c -s ours
Bill Yi [Mon, 21 Nov 2016 01:33:23 +0000 (01:33 +0000)]
Import translations. DO NOT MERGE am: 001632d55c  -s ours
am: 9e17133192  -s ours

Change-Id: Idda03611e22b67dba524f61ac9884de84950d962

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 21 Nov 2016 01:28:26 +0000 (01:28 +0000)]
Import translations. DO NOT MERGE
am: 001632d55c  -s ours

Change-Id: Ib267ac961a6ef99c9c1401e8967725b0f7914bac

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 21 Nov 2016 00:12:14 +0000 (16:12 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Id8af490796464cb8422fa4be023af34baee73002

7 years agoMerge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am: 89a055...
Jerry Zhang [Thu, 17 Nov 2016 00:39:37 +0000 (00:39 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am: 89a055aa9d am: 1451a4af78
am: 3473bc219e

Change-Id: I6064f90dcde32ccc5132fd5999224a99c7e378b0

7 years agoRefactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f...
Jerry Zhang [Thu, 17 Nov 2016 00:39:22 +0000 (00:39 +0000)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f am: a75fa91247
am: fd764ac0e3

Change-Id: Iee63263785e80cb1a893dc99204bb2fb225a497a

7 years agoMerge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am: 89a055aa9d
Jerry Zhang [Thu, 17 Nov 2016 00:24:57 +0000 (00:24 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am: 89a055aa9d
am: 1451a4af78

Change-Id: I90048a233d80ee023e9f775b540248b62aa5e4ea

7 years agoRefactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f
Jerry Zhang [Thu, 17 Nov 2016 00:24:50 +0000 (00:24 +0000)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f
am: a75fa91247

Change-Id: I70fdc7a2d4bfa40e315a4de172dbcee22d666cc6

7 years agoMerge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
Jerry Zhang [Thu, 17 Nov 2016 00:12:59 +0000 (00:12 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
am: 89a055aa9d

Change-Id: I8bad2864a848b46c99e2693acacb320615338ec8

7 years agoRefactor setCurrentFunction and setUsbDataUnlocked into one method
Jerry Zhang [Thu, 17 Nov 2016 00:09:38 +0000 (00:09 +0000)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method
am: a1b60e629f

Change-Id: I0ed28df5f24e7fe545f968c4d65cfc0494b57ebd

7 years agoMerge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
Jerry Zhang [Wed, 16 Nov 2016 23:59:32 +0000 (23:59 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"

7 years agoMerge "Add WiFi toggle prompts - settings" am: b4b2c2aa43 am: 6f126a8f5c
Sohani Rao [Mon, 14 Nov 2016 21:28:16 +0000 (21:28 +0000)]
Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43 am: 6f126a8f5c
am: 6cebca2599

Change-Id: I8cfaadb7dd8df6d81695dea8530a25de69fcce3d

7 years agoMerge "Add WiFi toggle prompts - settings" am: b4b2c2aa43
Sohani Rao [Mon, 14 Nov 2016 21:21:49 +0000 (21:21 +0000)]
Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43
am: 6f126a8f5c

Change-Id: I327d6c864ce58c21a74d628d1945f86ff518234c

7 years agoMerge "Add WiFi toggle prompts - settings"
Sohani Rao [Mon, 14 Nov 2016 21:14:54 +0000 (21:14 +0000)]
Merge "Add WiFi toggle prompts - settings"
am: b4b2c2aa43

Change-Id: Idef71123fde9475a549a1ccab136564ccf3d4a4a

7 years agoMerge "Add WiFi toggle prompts - settings"
Sohani Rao [Mon, 14 Nov 2016 20:59:35 +0000 (20:59 +0000)]
Merge "Add WiFi toggle prompts - settings"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 14 Nov 2016 19:44:02 +0000 (19:44 +0000)]
Import translations. DO NOT MERGE
am: d13efff7aa  -s ours

Change-Id: I03a2044f78ee22bc152cabc2a3c338aacd9f37fe

7 years agoAdd WiFi toggle prompts - settings
Svetoslav Ganov [Wed, 27 Jul 2016 01:26:45 +0000 (18:26 -0700)]
Add WiFi toggle prompts - settings

If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Bug: 28715749
Test: Unit tests
Change-Id: I10d1231ea0c47eec5993dbe367cc0c245cba9385
Merged-In: I10d1231ea0c47eec5993dbe367cc0c245cba9385

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 14 Nov 2016 17:50:59 +0000 (09:50 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32839141
Change-Id: I6145b97714693ec78cbc8b7d2235ed5830e7f714

7 years agoFix apn can't be updated when pressing back key
xiaocheng.x.wang [Tue, 23 Aug 2016 05:53:47 +0000 (13:53 +0800)]
Fix apn can't be updated when pressing back key

APN can't be updated because onkey() method is not invoked when user presses
the virtual back key. The ApnEditor was changed from Activity to Fragment
in Android N. A fragment can't receive onKey() event without calling
setFocusableInTouchMode(true).

Test: manual - updated apn setting, then pressed back
Bug: 32815214
Change-Id: I7824e84bd617d2057a61f4198fa7fd50f123bc8e

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Nov 2016 06:44:39 +0000 (06:44 +0000)]
Import translations. DO NOT MERGE
am: 416fa38e75  -s ours

Change-Id: Idfc5c51e90e9ccfb84256f532250ca5cfdf2a0a1

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Nov 2016 05:19:32 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE

Change-Id: I64f7cc447bbacc64f2993230946f87258496824a
Auto-generated-cl: translation import

7 years agoAdd subtypes to tron logging for Wifi toggles.
Stephen Chen [Fri, 4 Nov 2016 17:22:30 +0000 (17:22 +0000)]
Add subtypes to tron logging for Wifi toggles.
am: b21815e320

Change-Id: Ia08aa862e311dba4af08a1a76c0083519dcdeeb9

7 years agoAdd subtypes to tron logging for Wifi toggles.
Stephen Chen [Mon, 31 Oct 2016 19:59:41 +0000 (12:59 -0700)]
Add subtypes to tron logging for Wifi toggles.

For ACTION_WIFI_CONNECT, added subtype to specify whether user is
connecting to saved network.
For ACTION_WIFI_OFF, added subtype to specify whether user was connected
to a network at the time.

Bug: 32371451
Test: Verify logs by running:
adb logcat -b events | egrep '(sysui_|notification_)'
Merged-In: I1d4445bda2fbeb062831e6f858ccc711bff65105

Change-Id: I6b87dc10fcfe412f1c72ae944c2dd4d81da12b53

7 years agoMerge "Fix crash while searching in Settings" am: 176c0c5d98 am: d705a333ca
Juan Flores [Wed, 2 Nov 2016 16:47:33 +0000 (16:47 +0000)]
Merge "Fix crash while searching in Settings" am: 176c0c5d98 am: d705a333ca
am: 16455893d7

Change-Id: Ic41c29b7d3ba2c90e4c375c843ea8532b236f4a4

7 years agoMerge "Fix crash while searching in Settings" am: 176c0c5d98
Juan Flores [Wed, 2 Nov 2016 16:45:03 +0000 (16:45 +0000)]
Merge "Fix crash while searching in Settings" am: 176c0c5d98
am: d705a333ca

Change-Id: I31732b822a80caa52cb97c43ea093dea8c0b19cb

7 years agoMerge "Fix crash while searching in Settings"
Juan Flores [Wed, 2 Nov 2016 16:42:03 +0000 (16:42 +0000)]
Merge "Fix crash while searching in Settings"
am: 176c0c5d98

Change-Id: Iaaf4de39939728e9b2645e119437a9142473a5b1

7 years agoMerge "Fix crash while searching in Settings"
Treehugger Robot [Wed, 2 Nov 2016 16:37:07 +0000 (16:37 +0000)]
Merge "Fix crash while searching in Settings"

7 years agoFix crash when opening account sync detail for external app am: c9cdc25f41 am: f3e86ca481
Fan Zhang [Tue, 1 Nov 2016 17:25:38 +0000 (17:25 +0000)]
Fix crash when opening account sync detail for external app am: c9cdc25f41 am: f3e86ca481
am: ce01f167e1

Change-Id: I36a67f2241b1a4e2fc8787adb84af31209084ede

7 years agoFix crash when opening account sync detail for external app am: c9cdc25f41
Fan Zhang [Tue, 1 Nov 2016 17:23:38 +0000 (17:23 +0000)]
Fix crash when opening account sync detail for external app am: c9cdc25f41
am: f3e86ca481

Change-Id: I3ca70edada88ee6d7c4dde2ba7e5972233357add

7 years agoFix crash when opening account sync detail for external app
Fan Zhang [Tue, 1 Nov 2016 17:21:36 +0000 (17:21 +0000)]
Fix crash when opening account sync detail for external app
am: c9cdc25f41

Change-Id: Ic8016695966d64c02c4e2fbe37703db8c771930e

7 years agoFix crash when opening account sync detail for external app
Fan Zhang [Mon, 31 Oct 2016 19:45:49 +0000 (12:45 -0700)]
Fix crash when opening account sync detail for external app

Bug: 32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit e3ad2b56c31f3f9fa751647197b8b2ca5cdb0fb6)

7 years agoMerge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c am: 27c5edb968
Paul Stewart [Fri, 28 Oct 2016 21:14:38 +0000 (21:14 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c am: 27c5edb968
am: dab924f04d

Change-Id: I06bad134648c70f432194e163a8e0a5829f514f0

7 years agoMerge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c
Paul Stewart [Fri, 28 Oct 2016 21:09:38 +0000 (21:09 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c
am: 27c5edb968

Change-Id: I427261d397f0003f1e4eecd55d431441303e4b4c

7 years agoMerge "Don't display an invalid Wi-Fi MAC address"
Paul Stewart [Fri, 28 Oct 2016 21:04:40 +0000 (21:04 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address"
am: 917b7b863c

Change-Id: I61b50ff7a50551e12a218d73bcf95f0c24e64430

7 years agoMerge "Don't display an invalid Wi-Fi MAC address"
Treehugger Robot [Fri, 28 Oct 2016 20:56:35 +0000 (20:56 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address"

7 years agoMerge "Add Bluetooth toggle prompts - settings" am: de037d5491 -s ours am: ce2a10b743
Marie Janssen [Fri, 28 Oct 2016 02:57:06 +0000 (02:57 +0000)]
Merge "Add Bluetooth toggle prompts - settings" am: de037d5491  -s ours am: ce2a10b743
am: 6e8a67c008

Change-Id: I0fc40f9a3f3a8488e696727d08084f2d2b9d2d75

7 years agoMerge "Add Bluetooth toggle prompts - settings" am: de037d5491 -s ours
Marie Janssen [Fri, 28 Oct 2016 02:52:12 +0000 (02:52 +0000)]
Merge "Add Bluetooth toggle prompts - settings" am: de037d5491  -s ours
am: ce2a10b743

Change-Id: If2a0712b38cfd85af1502e68bdda39d1be8735b6

7 years agoMerge "Add Bluetooth toggle prompts - settings"
Marie Janssen [Fri, 28 Oct 2016 02:45:39 +0000 (02:45 +0000)]
Merge "Add Bluetooth toggle prompts - settings"
am: de037d5491  -s ours

Change-Id: I4d809fb02c07ad366b6e5954ac3c0dbc0f5c597d

7 years agoMerge "Add Bluetooth toggle prompts - settings"
Marie Janssen [Thu, 27 Oct 2016 23:07:31 +0000 (23:07 +0000)]
Merge "Add Bluetooth toggle prompts - settings"

7 years agoDon't display an invalid Wi-Fi MAC address
Paul Stewart [Thu, 27 Oct 2016 20:29:05 +0000 (13:29 -0700)]
Don't display an invalid Wi-Fi MAC address

Only display the WifiInfo MAC address if it is a valid address.
Otherwise, display "Unavailable".  The underlying WifiInfo class
now has a default value, and a method that can be used to test
whether or not the contained address is valid.  This change uses
this test and avoids having the confusing default address displayed.

Bug: 32478606
Test: Manual: Turn off WiFi and reboot -- make sure "Unavailable"
      is displayed as the Wi-Fi MAC Address as opposed to "02:00:00:00:00:00"

Change-Id: I912804eb65735375e0ca3c4618a6399543f33b57

7 years agoImport translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours...
Bill Yi [Thu, 27 Oct 2016 05:36:09 +0000 (05:36 +0000)]
Import translations. DO NOT MERGE am: bb6af9902d  -s ours am: 061b294714  -s ours am: 4666b50754  -s ours
am: 69e4232f8d  -s ours

Change-Id: Icedc51c61aa4c3b8aa80016617e9e6fc8ebf72fa

7 years agoImport translations. DO NOT MERGE am: e7f9b0b30b -s ours am: f8b4927683 -s ours
Bill Yi [Thu, 27 Oct 2016 05:35:55 +0000 (05:35 +0000)]
Import translations. DO NOT MERGE am: e7f9b0b30b  -s ours am: f8b4927683  -s ours
am: f55f67e409  -s ours

Change-Id: I650772657134b60a80f91d2dd0f5d740233aecbc

7 years agoImport translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours
Bill Yi [Thu, 27 Oct 2016 05:31:37 +0000 (05:31 +0000)]
Import translations. DO NOT MERGE am: bb6af9902d  -s ours am: 061b294714  -s ours
am: 4666b50754  -s ours

Change-Id: I89ed1044560f40ebb78d0e1b9bf07a4a7cd575b7

7 years agoImport translations. DO NOT MERGE am: e7f9b0b30b -s ours
Bill Yi [Thu, 27 Oct 2016 05:31:24 +0000 (05:31 +0000)]
Import translations. DO NOT MERGE am: e7f9b0b30b  -s ours
am: f8b4927683  -s ours

Change-Id: I9d28fc31d3dc6ead839e36b000d16cec353562fd

7 years agoImport translations. DO NOT MERGE am: bb6af9902d -s ours
Bill Yi [Thu, 27 Oct 2016 05:27:37 +0000 (05:27 +0000)]
Import translations. DO NOT MERGE am: bb6af9902d  -s ours
am: 061b294714  -s ours

Change-Id: If6f1925ffdab47128db255040e97a45733f819d5

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 05:27:22 +0000 (05:27 +0000)]
Import translations. DO NOT MERGE
am: e7f9b0b30b  -s ours

Change-Id: I4297eed21e6b8854801a3e9a6f9904b1dadaab72

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 05:22:55 +0000 (05:22 +0000)]
Import translations. DO NOT MERGE
am: bb6af9902d  -s ours

Change-Id: I601e2eb4a89830873bee3f05b77d90b0e9dff9bb

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 04:56:50 +0000 (04:56 +0000)]
Import translations. DO NOT MERGE
am: 06f30f99c0  -s ours

Change-Id: I573f6294350759b53b9c12c3a21cd2b571393b2a

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 04:04:20 +0000 (21:04 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie7733c16a2d1b8502a2b33e10fe0c4fa0e6d9138
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 03:59:24 +0000 (20:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: I51115d580c3d823482a01f078fd23b2690f3899b
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 03:51:47 +0000 (20:51 -0700)]
Import translations. DO NOT MERGE

Change-Id: I593dba1b6fda93a08279272c8e4061c464899afc
Auto-generated-cl: translation import

7 years agoAdd Bluetooth toggle prompts - settings
Svetoslav Ganov [Sat, 23 Jul 2016 03:08:41 +0000 (20:08 -0700)]
Add Bluetooth toggle prompts - settings

If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
(cherry picked from commit b06766f129dac138568883110f6d2a085b53445b)

7 years agoNexus imprint setting is missing while adding corp account from SUW am: 378dec1495...
Steven Ng [Tue, 25 Oct 2016 22:23:35 +0000 (22:23 +0000)]
Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495 am: 046a63450f
am: bde2c59f00

Change-Id: Ie6c4a37d9aaaf9cba94c6fc050600f8acf13f53e

7 years agoNexus imprint setting is missing while adding corp account from SUW am: 378dec1495
Steven Ng [Tue, 25 Oct 2016 22:19:05 +0000 (22:19 +0000)]
Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495
am: 046a63450f

Change-Id: I3a393fb00ab8f312ca078b08feb42decb106fb81

7 years agoNexus imprint setting is missing while adding corp account from SUW
Steven Ng [Tue, 25 Oct 2016 22:15:03 +0000 (22:15 +0000)]
Nexus imprint setting is missing while adding corp account from SUW
am: 378dec1495

Change-Id: I829c9738c70ec8242fb2c3fdcf7eecd5ff39df7c

7 years agoNexus imprint setting is missing while adding corp account from SUW
Steven Ng [Tue, 25 Oct 2016 16:23:30 +0000 (17:23 +0100)]
Nexus imprint setting is missing while adding corp account from SUW

+ This is caused by the encryption interstitial result code not handled
  in ChooseLockGeneric. Change the request code of launching encryption
  interstitial screen to CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST if it
  is set new password flow.

Testing
Test: See below
1) Auto
   make RunSettingsRoboTests
2) Manual
   On a device (Nexus 5x) that shows encryption interstital screen and
   supports fingerprint.
   1) Nexus imprint flow (regression test)
      Fingerprint can be enrolled with the following flow.
      Settings > Security > Nexus Imprint > FingerprintEnrollIntroduction
      > ChooseLockGeneric (Unlock selection) > Encryption Interstitial
      > Password setup > Notification Interstitial
      > Find sensor and fingerprint enrollment
   2) Set new password test
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Nexus Imprint + Pattern.
      iii) Choose "Require pattern to start device"
      iv) Set a pattern lock.
      v) Choose any of the notification behavior.
      vi) Can enroll a fingerprint.

Bug: 32382952

Change-Id: Ie66ffca2e8c3cc46b5e8b619bd35986e4f41d5ab

7 years agoRefactor setCurrentFunction and setUsbDataUnlocked into one method
Jerry Zhang [Wed, 12 Oct 2016 21:42:56 +0000 (14:42 -0700)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method

This allows us to get rid of an extraneous config switch and
simplify some code.

Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
(cherry picked from commit 5d36a177d95184aaa0763d07aa38ff028f5a9b9c)

7 years agoImport translations. DO NOT MERGE am: a6d9842695 -s ours am: c027907edc -s ours...
Bill Yi [Tue, 25 Oct 2016 06:48:05 +0000 (06:48 +0000)]
Import translations. DO NOT MERGE am: a6d9842695  -s ours am: c027907edc  -s ours am: f8032d0b15  -s ours
am: 79d7ca6010  -s ours

Change-Id: Icc5f7f210bd15607918cf967b0e5e47952034e25

7 years agoImport translations. DO NOT MERGE am: 475763d01c -s ours am: 9a22968ff8 -s ours
Bill Yi [Tue, 25 Oct 2016 06:47:51 +0000 (06:47 +0000)]
Import translations. DO NOT MERGE am: 475763d01c  -s ours am: 9a22968ff8  -s ours
am: 44ab95f758  -s ours

Change-Id: Ic439351fb3ab9c1153fba758b2c4ebe229e04ff3

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 25 Oct 2016 06:47:27 +0000 (06:47 +0000)]
Import translations. DO NOT MERGE
am: 9351e5f083  -s ours

Change-Id: I4c60ee71fe030300677212e0897a204b7f29b463

7 years agoImport translations. DO NOT MERGE am: a6d9842695 -s ours am: c027907edc -s ours
Bill Yi [Tue, 25 Oct 2016 06:38:04 +0000 (06:38 +0000)]
Import translations. DO NOT MERGE am: a6d9842695  -s ours am: c027907edc  -s ours
am: f8032d0b15  -s ours

Change-Id: I08630831bbe4204fd9a86c30e9710abea02cb78c

7 years agoImport translations. DO NOT MERGE am: 475763d01c -s ours
Bill Yi [Tue, 25 Oct 2016 06:37:49 +0000 (06:37 +0000)]
Import translations. DO NOT MERGE am: 475763d01c  -s ours
am: 9a22968ff8  -s ours

Change-Id: Id515f8c57aeb9c6a478d025b4a7223acb8163b72

7 years agoImport translations. DO NOT MERGE am: a6d9842695 -s ours
Bill Yi [Tue, 25 Oct 2016 06:30:52 +0000 (06:30 +0000)]
Import translations. DO NOT MERGE am: a6d9842695  -s ours
am: c027907edc  -s ours

Change-Id: I09c421885fb40a57e309a083413797bac5de053b

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 25 Oct 2016 06:30:37 +0000 (06:30 +0000)]
Import translations. DO NOT MERGE
am: 475763d01c  -s ours

Change-Id: I4b54504ffad69e916590de47d505979b82325827

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 25 Oct 2016 06:30:08 +0000 (06:30 +0000)]
Import translations. DO NOT MERGE
am: a6d9842695  -s ours

Change-Id: Ic902f00f1abc643ecfb2e567d7368815bf727d62

7 years agoFix crash while searching in Settings
Juan Flores [Mon, 27 Oct 2014 13:12:20 +0000 (14:12 +0100)]
Fix crash while searching in Settings

A crash occurrs when power button is pressed during search in Settings
due to IndexOutOfBoundsException in HeaderViewListAdapter.
When suggestions and results are cleared,
the layouts should be invisible to solve this problem.

Bug: 27913974
Test: manual - search "font" and press power button twice

Change-Id: Ia53d393e695dbb238fc4c82a3fe52ef4250d84c1

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 24 Oct 2016 19:40:25 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic23d8689a23264722dd70856138fbda6a214e7cb
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 24 Oct 2016 19:35:20 +0000 (12:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: I75261b567ac55ce6adfbcdadb63a058dfeac9bda
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 24 Oct 2016 19:27:49 +0000 (12:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie8400c22cf5931503997d0dc93b0358ee40c89d7
Auto-generated-cl: translation import

7 years agoEnsure that the gesture animation video is paused properly. am: 4245ad4771
Doris Ling [Fri, 21 Oct 2016 23:46:51 +0000 (23:46 +0000)]
Ensure that the gesture animation video is paused properly. am: 4245ad4771
am: 5e4fce04fb

Change-Id: Ic615738b57a4ca49f5c6101e86aea03dbf0f9a12