OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoam 262b64e7: (-s ours) am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW...
Billy Lau [Thu, 27 Aug 2015 11:33:04 +0000 (11:33 +0000)]
am 262b64e7: (-s ours) am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev

* commit '262b64e7a994fd07fa5891648908ef98de42ab61':

8 years agoam feb343ad: (-s ours) am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be...
Christopher Tate [Thu, 27 Aug 2015 11:32:59 +0000 (11:32 +0000)]
am feb343ad: (-s ours) am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible

* commit 'feb343ad74ad4fe5e9b762da99e73682500f9b1a':

8 years agoam e200c475: (-s ours) am 705faddb: Merge "Show disabled trust agents as off." into...
Kenny Guy [Thu, 27 Aug 2015 11:32:55 +0000 (11:32 +0000)]
am e200c475: (-s ours) am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev

* commit 'e200c4759f0f3d4fdfae5b965248050feaabe5ef':

8 years agoam bee718b7: (-s ours) am 046decca: Merge "Use common xml file for multi-tab settings...
Sanket Padawe [Thu, 27 Aug 2015 11:32:50 +0000 (11:32 +0000)]
am bee718b7: (-s ours) am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev

* commit 'bee718b7b1a9d675f3f652c2691f42a74ae0d559':

8 years agoam d4fa7aa4: (-s ours) am bec1d295: Merge "[Fingerprint] Use accent color for fingerp...
Maurice Lam [Thu, 27 Aug 2015 11:32:46 +0000 (11:32 +0000)]
am d4fa7aa4: (-s ours) am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev

* commit 'd4fa7aa48c692fab0fc277021d5054650e0867eb':

8 years agoam 94b75858: (-s ours) am 50972605: Merge "Disable ignore battery optimization items...
Jason Monk [Thu, 27 Aug 2015 11:32:42 +0000 (11:32 +0000)]
am 94b75858: (-s ours) am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev

* commit '94b7585895751cd4db313ffa708fdff01f34b0d9':

8 years agoam 5fa374cc: (-s ours) am 4a6b9095: Merge "Change move storage from dropdown pref...
Jason Monk [Thu, 27 Aug 2015 11:32:39 +0000 (11:32 +0000)]
am 5fa374cc: (-s ours) am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev

* commit '5fa374cc20f4e0afc9da5644faf9ead86e7c4e57':

8 years agoam 58a6af14: (-s ours) am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in...
Maurice Lam [Thu, 27 Aug 2015 11:32:29 +0000 (11:32 +0000)]
am 58a6af14: (-s ours) am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev

* commit '58a6af1496e457a799ff1b43b6426fb2812a22ce':

8 years agoam 2a414b93: (-s ours) am 6b9d7889: Merge "Fixed the layout for the fingerprint renam...
Jim Miller [Thu, 27 Aug 2015 11:32:25 +0000 (11:32 +0000)]
am 2a414b93: (-s ours) am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev

* commit '2a414b9368fcc06bf7c849f8fb982038feaf6e5e':

8 years agoam d7be0656: (-s ours) am f90628c6: Merge "[Fingerprint] Export FingerprintEnrollIntr...
Maurice Lam [Thu, 27 Aug 2015 11:32:22 +0000 (11:32 +0000)]
am d7be0656: (-s ours) am f90628c6: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev

* commit 'd7be0656ff51e20585916af19680a2c55ce03470':

8 years agoam 4a381902: (-s ours) am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings...
Jason Monk [Thu, 27 Aug 2015 11:32:18 +0000 (11:32 +0000)]
am 4a381902: (-s ours) am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev

* commit '4a3819027a51681ed416177a3ecd0d1b22cfc82a':

8 years agoam e1875783: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 27 Aug 2015 11:32:15 +0000 (11:32 +0000)]
am e1875783: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE

* commit 'e18757830920dcce30c78942582a0702a75806d0':

8 years agoam 45e1e1ec: (-s ours) am 83a25842: Merge "Lose some deprecated test annotations."
Narayan Kamath [Thu, 27 Aug 2015 11:32:13 +0000 (11:32 +0000)]
am 45e1e1ec: (-s ours) am 83a25842: Merge "Lose some deprecated test annotations."

* commit '45e1e1ec928b236db0194b304361735fd93161ef':

8 years agoam e9c822b0: (-s ours) am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tether...
xinhe [Thu, 27 Aug 2015 11:32:11 +0000 (11:32 +0000)]
am e9c822b0: (-s ours) am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev

* commit 'e9c822b0c6f29d920eeed4c19c90e202c68a70b5':

8 years agoam 52374856: (-s ours) am e641e7d7: Merge "Postpone call to postEnroll() until we...
Jim Miller [Thu, 27 Aug 2015 11:32:09 +0000 (11:32 +0000)]
am 52374856: (-s ours) am e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev

* commit '52374856e8d53f38ed1f313591598275316e4376':

8 years agoam 81044820: (-s ours) am acc70a3a: Merge "Add content description to wifi networks...
Jason Monk [Thu, 27 Aug 2015 11:32:06 +0000 (11:32 +0000)]
am 81044820: (-s ours) am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev

* commit '810448204fd3fa4fd305fd40ee89da81cbd57d0f':

8 years agoam 45b27c3a: (-s ours) am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDO...
Billy Lau [Thu, 27 Aug 2015 11:32:04 +0000 (11:32 +0000)]
am 45b27c3a: (-s ours) am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev

* commit '45b27c3a04b997362d0884d2e52aa54d8fff1319':

8 years agoam 8f37d4bc: (-s ours) am 8505d4a5: Merge "Disable voice input if assist is voice...
Jorim Jaggi [Thu, 27 Aug 2015 11:32:02 +0000 (11:32 +0000)]
am 8f37d4bc: (-s ours) am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev

* commit '8f37d4bc11841a3084a31471756b7d61d433c2eb':

8 years agoam 31e05386: (-s ours) am 7713fe26: Merge "Disable notification volume when user...
Jason Monk [Thu, 27 Aug 2015 11:32:01 +0000 (11:32 +0000)]
am 31e05386: (-s ours) am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev

* commit '31e0538651f07e6fea67bf3dc3605b227ed26dea':

8 years agoam 90d21f09: (-s ours) am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into...
Martijn Coenen [Thu, 27 Aug 2015 11:31:59 +0000 (11:31 +0000)]
am 90d21f09: (-s ours) am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev

* commit '90d21f096783e5d8fd3c44a0e69dd375bf301bd1':

8 years agoam 34e7b4cd: (-s ours) am 53dd1d4d: Merge "Fix app icon size" into mnc-dev
Jason Monk [Thu, 27 Aug 2015 11:31:58 +0000 (11:31 +0000)]
am 34e7b4cd: (-s ours) am 53dd1d4d: Merge "Fix app icon size" into mnc-dev

* commit '34e7b4cd0578527e9f86affb66048ea43870bdcb':

8 years agoam c319bac5: (-s ours) am 7995ca41: Use same technology type for LTE/4G
Sanket Padawe [Thu, 27 Aug 2015 11:31:56 +0000 (11:31 +0000)]
am c319bac5: (-s ours) am 7995ca41: Use same technology type for LTE/4G

* commit 'c319bac558a7dae2e8df60a8ebc117d8bd712621':

8 years agoam ae15849d: (-s ours) am 2f8bb8ea: Merge "import new view enums into MetricsLogger...
Chris Wren [Thu, 27 Aug 2015 11:31:55 +0000 (11:31 +0000)]
am ae15849d: (-s ours) am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev

* commit 'ae15849d114f6f0e24acb8acf5f7528aeb4d852a':

8 years agoam 329cea48: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Thu, 27 Aug 2015 11:31:53 +0000 (11:31 +0000)]
am 329cea48: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '329cea489bee113ff6534ba8cd0f981052d22bc8':

8 years agoam 30a73372: (-s ours) am 098c296d: Merge "Do not throw exception when MeasurementDet...
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 11:31:52 +0000 (11:31 +0000)]
am 30a73372: (-s ours) am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev

* commit '30a73372c4498b671b728e29ff1b7391e58057c5':

8 years agoam 88afe4a4: (-s ours) am da15ade8: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 27 Aug 2015 11:31:51 +0000 (11:31 +0000)]
am 88afe4a4: (-s ours) am da15ade8: (-s ours) Import translations. DO NOT MERGE

* commit '88afe4a4d7e4cb876908c1898f610dabbd5c7202':

8 years agoam 27c45eb9: (-s ours) am 7ba46433: Merge "Match getLegacyVpn calls to changed interf...
Robin Lee [Thu, 27 Aug 2015 11:31:50 +0000 (11:31 +0000)]
am 27c45eb9: (-s ours) am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev

* commit '27c45eb9f24a6fe12ad61199b90bb8fdbd0df4db':

8 years agoam 20eb7e10: (-s ours) am 331b9823: Merge "Remove unused MediaFormat activity" into...
Rubin Xu [Thu, 27 Aug 2015 11:31:48 +0000 (11:31 +0000)]
am 20eb7e10: (-s ours) am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev

* commit '20eb7e10f27f564cb40ad5f0398fb2e8c17d897a':

8 years agoam 4484cc4f: (-s ours) am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
Jason Monk [Thu, 27 Aug 2015 11:31:46 +0000 (11:31 +0000)]
am 4484cc4f: (-s ours) am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev

* commit '4484cc4ff4c1bef78ac52d8abd8351b09a9a1e1b':

8 years agoam bc79da2b: (-s ours) am ddd887af: Prevent crash when removing an account.
Julia Reynolds [Thu, 27 Aug 2015 11:31:44 +0000 (11:31 +0000)]
am bc79da2b: (-s ours) am ddd887af: Prevent crash when removing an account.

* commit 'bc79da2b3e32fe86628e61aedba57d391053a382':

8 years agoam 46ea05da: (-s ours) am 963e3fdd: Merge "Talkback improvements for Settings screens...
Julia Reynolds [Thu, 27 Aug 2015 11:31:42 +0000 (11:31 +0000)]
am 46ea05da: (-s ours) am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev

* commit '46ea05da72db4719faed1c3ec173448d7a2f0706':

8 years agoam dee0d05b: (-s ours) am 5c3b7c3a: Merge "Don\'t clear data summary when loader...
Jason Monk [Thu, 27 Aug 2015 11:31:39 +0000 (11:31 +0000)]
am dee0d05b: (-s ours) am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev

* commit 'dee0d05b5c6797b860fef9e6591249391956edc3':

8 years agoam 296aec41: (-s ours) am b6b85325: Merge "Fix rotation issues" into mnc-dev
Jason Monk [Thu, 27 Aug 2015 11:31:37 +0000 (11:31 +0000)]
am 296aec41: (-s ours) am b6b85325: Merge "Fix rotation issues" into mnc-dev

* commit '296aec4127468ca79c1db60672a2cb0d39e3b0c1':

8 years agoam b0afdf2f: (-s ours) am ee77eced: Merge "Check signature match between Cert install...
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 11:31:34 +0000 (11:31 +0000)]
am b0afdf2f: (-s ours) am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev

* commit 'b0afdf2f5ab38b947cee443979d9833bd1af03c2':

8 years agoam b0a8c420: (-s ours) am 4bbe3d1f: Update all shown preferences in Settings > Storage
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 11:31:32 +0000 (11:31 +0000)]
am b0a8c420: (-s ours) am 4bbe3d1f: Update all shown preferences in Settings > Storage

* commit 'b0a8c4203c859ee26d1989387e0406d0a86da6f5':

8 years agoam a5251bbc: (-s ours) am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into...
Sasha Levitskiy [Thu, 27 Aug 2015 11:31:30 +0000 (11:31 +0000)]
am a5251bbc: (-s ours) am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev

* commit 'a5251bbcffc5e740c278b8d600481e705a1e9277':

8 years agoam ad1aa525: (-s ours) am 49983b99: Show correct text for app link domains.
Tim Kilbourn [Thu, 27 Aug 2015 11:31:28 +0000 (11:31 +0000)]
am ad1aa525: (-s ours) am 49983b99: Show correct text for app link domains.

* commit 'ad1aa5252fcef6ec6537f0fa9da3e84818a78512':

8 years agoam 221e0f44: (-s ours) am b493b291: Merge "Hide screenshot preference when assist...
Jorim Jaggi [Thu, 27 Aug 2015 11:31:27 +0000 (11:31 +0000)]
am 221e0f44: (-s ours) am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev

* commit '221e0f4400e25ee40bf3428c89b8de5a9415ba9a':

8 years agoam 6b09d2c9: (-s ours) am 80eba76b: Merge "Move storage when formatting primary disk...
Jeff Sharkey [Thu, 27 Aug 2015 11:31:25 +0000 (11:31 +0000)]
am 6b09d2c9: (-s ours) am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev

* commit '6b09d2c9825a0936027e509f36ad04ccc12883d5':

8 years agoam 5fc2772b: (-s ours) am 01ce80b5: Merge "Remove \'do not translate\' comment for...
Amit Mahajan [Thu, 27 Aug 2015 11:31:23 +0000 (11:31 +0000)]
am 5fc2772b: (-s ours) am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev

* commit '5fc2772b5d3486f2b7ad48556ff945a0b3e267e5':

8 years agoam 2d633c97: (-s ours) am c7777b94: Merge "Locale based string changes in BT." into...
Sanket Padawe [Thu, 27 Aug 2015 11:31:22 +0000 (11:31 +0000)]
am 2d633c97: (-s ours) am c7777b94: Merge "Locale based string changes in BT." into mnc-dev

* commit '2d633c9744a0b2ae7373068cdca752777df439d1':

8 years agoam 88701273: (-s ours) am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA...
Sanket Padawe [Thu, 27 Aug 2015 11:31:20 +0000 (11:31 +0000)]
am 88701273: (-s ours) am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev

* commit '88701273e3056d86fb2f442400de9dec994d669e':

8 years agoam d1e93240: (-s ours) am 64e1e15d: Merge "Restore Vpn advanced options on re-init...
Robin Lee [Thu, 27 Aug 2015 11:31:17 +0000 (11:31 +0000)]
am d1e93240: (-s ours) am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev

* commit 'd1e93240aadca200462de351415abed5e856b58c':

8 years agoam 74d8ac2e: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Thu, 27 Aug 2015 11:31:14 +0000 (11:31 +0000)]
am 74d8ac2e: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '74d8ac2e274f0a19f5164191e8dd00dd8e741428':

8 years agoam 49c78619: (-s ours) am 4652115f: Merge "Handle uninstall from notifications list...
Jason Monk [Thu, 27 Aug 2015 11:31:10 +0000 (11:31 +0000)]
am 49c78619: (-s ours) am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev

* commit '49c7861984dfe4bf4516a5666995e3b36c0f7fd7':

8 years agoam 909ddcca: (-s ours) am 296e0aff: Merge "Filter USB options on chooser when DISALLO...
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 11:31:07 +0000 (11:31 +0000)]
am 909ddcca: (-s ours) am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev

* commit '909ddcca43803078c838da0c6b9a9c84ddb715a6':

8 years agoam e78d9ab7: (-s ours) am 461a48ba: Merge "Making Settings > Storage multiprofile...
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 11:31:02 +0000 (11:31 +0000)]
am e78d9ab7: (-s ours) am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev

* commit 'e78d9ab78f379cfa4e9ada05115ffc16621f1d5e':

8 years agoam 2db668d5: (-s ours) am 8023385e: Merge "App link handling is not just for "officia...
Christopher Tate [Thu, 27 Aug 2015 11:30:57 +0000 (11:30 +0000)]
am 2db668d5: (-s ours) am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev

* commit '2db668d547674e787f2c8fef101c7385ad9677a6':

8 years agoam 5ce2a7f5: (-s ours) am 7ac21204: Merge "Use localized name for guest user" into...
Amith Yamasani [Thu, 27 Aug 2015 11:30:42 +0000 (11:30 +0000)]
am 5ce2a7f5: (-s ours) am 7ac21204: Merge "Use localized name for guest user" into mnc-dev

* commit '5ce2a7f5c46ddced28400f62f4daa87269fc5ff5':

8 years agoam 09c30740: (-s ours) am 2bd619d5: Merge "Text changes to assist & voice input"...
Jorim Jaggi [Thu, 27 Aug 2015 11:30:36 +0000 (11:30 +0000)]
am 09c30740: (-s ours) am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit '09c307401893886a7d82baa520f33d6956b56de4':

8 years agoam 31d519fe: (-s ours) am 66b5a58a: Merge "Fix init order so we have something to...
Jeff Sharkey [Thu, 27 Aug 2015 11:30:29 +0000 (11:30 +0000)]
am 31d519fe: (-s ours) am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev

* commit '31d519fe37f6132f01b6193fec91d9f9b5b97908':

8 years agoam 139e1964: (-s ours) am 7616b00b: Merge changes from topic \'mig\' into mnc-dev
Jeff Sharkey [Thu, 27 Aug 2015 11:30:22 +0000 (11:30 +0000)]
am 139e1964: (-s ours) am 7616b00b: Merge changes from topic \'mig\' into mnc-dev

* commit '139e19647169a736d1f8b1b71479bd36742a2341':

8 years agoam 479b00cd: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 27 Aug 2015 11:30:06 +0000 (11:30 +0000)]
am 479b00cd: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE

* commit '479b00cd40c0173ba3e51f072efa0aa5e432234c':

8 years agoam ebf23a76: (-s ours) am 3b545b41: (-s ours) am fbfdede1: (-s ours) Import translati...
Geoff Mendal [Wed, 26 Aug 2015 14:33:36 +0000 (14:33 +0000)]
am ebf23a76: (-s ours) am 3b545b41: (-s ours) am fbfdede1: (-s ours) Import translations. DO NOT MERGE

* commit 'ebf23a763f240b203480d53bc29895d14e230f89':
  Import translations. DO NOT MERGE

8 years agoam 3b545b41: (-s ours) am fbfdede1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 14:25:58 +0000 (14:25 +0000)]
am 3b545b41: (-s ours) am fbfdede1: (-s ours) Import translations. DO NOT MERGE

* commit '3b545b41b931919fab3528e2bbb81ded620378b2':
  Import translations. DO NOT MERGE

8 years agoam fbfdede1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 14:19:37 +0000 (14:19 +0000)]
am fbfdede1: (-s ours) Import translations. DO NOT MERGE

* commit 'fbfdede15b6a81655a5b4fc274340ba58c3d4a99':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 14:12:08 +0000 (07:12 -0700)]
Import translations. DO NOT MERGE

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

8 years agoam d63408d9: am d7e4cd9b: am f7fc6429: Merge "Don\'t attempt to remove fp templates...
Jim Miller [Tue, 25 Aug 2015 23:33:55 +0000 (23:33 +0000)]
am d63408d9: am d7e4cd9b: am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev

* commit 'd63408d91576277acec9c2169e48eff839516470':
  Don't attempt to remove fp templates if none are enrolled

8 years agoam d7e4cd9b: am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are...
Jim Miller [Tue, 25 Aug 2015 23:25:08 +0000 (23:25 +0000)]
am d7e4cd9b: am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev

* commit 'd7e4cd9b1edb25651d3fa306e389b7ec858c1ed8':
  Don't attempt to remove fp templates if none are enrolled

8 years agoam f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into...
Jim Miller [Tue, 25 Aug 2015 23:18:54 +0000 (23:18 +0000)]
am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev

* commit 'f7fc6429874fd02bc3670bce98b2158d2a78aecd':
  Don't attempt to remove fp templates if none are enrolled

8 years agoMerge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev
Jim Miller [Tue, 25 Aug 2015 23:08:55 +0000 (23:08 +0000)]
Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev

8 years agoam 70238114: am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 18:37:40 +0000 (18:37 +0000)]
am 70238114: am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.

* commit '702381144781d68551e765dcf8b23cf3dbca3ce5':
  Refactor UidDetailProvider and its dependencies to SettingsLib.

8 years agoam 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 18:32:41 +0000 (18:32 +0000)]
am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.

* commit '6e58d516f05bbceabdddd3aa08a94fcc32858e71':
  Refactor UidDetailProvider and its dependencies to SettingsLib.

8 years agoam ad50b81f: am 0e309b86: Merge "Move SummaryForAllUidLoader to SettingsLib." into...
Wei Liu [Tue, 25 Aug 2015 18:11:06 +0000 (18:11 +0000)]
am ad50b81f: am 0e309b86: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev

* commit 'ad50b81f492fb01390679f697d1f340da35ef28c':
  Move SummaryForAllUidLoader to SettingsLib.

8 years agoam 0e309b86: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
Wei Liu [Tue, 25 Aug 2015 18:03:37 +0000 (18:03 +0000)]
am 0e309b86: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev

* commit '0e309b867d1872b8cd0d6d435e10d6d3be48a3bd':
  Move SummaryForAllUidLoader to SettingsLib.

8 years agoRefactor UidDetailProvider and its dependencies to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 00:29:04 +0000 (17:29 -0700)]
Refactor UidDetailProvider and its dependencies to SettingsLib.

so that it can be reused by Wear app data usage.

Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867

8 years agoMerge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
Wei Liu [Tue, 25 Aug 2015 17:55:31 +0000 (17:55 +0000)]
Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev

8 years agoMove SummaryForAllUidLoader to SettingsLib.
Wei Liu [Fri, 21 Aug 2015 05:33:46 +0000 (22:33 -0700)]
Move SummaryForAllUidLoader to SettingsLib.

In order to show the data usage per app on Android Wear,
I'm moving SummaryForAllUidLoader to SettingsLib so that
the code can be reused.

Change-Id: I1833492d4a3b513405bfc1069b8656d04dd37c48

8 years agoam 226dec50: am 8b58dc57: am 1a9626f0: am 3be6d0b4: Merge "Avoid new network to conne...
Sanket Padawe [Mon, 24 Aug 2015 18:21:51 +0000 (18:21 +0000)]
am 226dec50: am 8b58dc57: am 1a9626f0: am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev

* commit '226dec509dd03638dbb489a75f35ec49d2fe4dca':
  Avoid new network to connect by using "Add Network" instead only Save it.

8 years agoam 8b58dc57: am 1a9626f0: am 3be6d0b4: Merge "Avoid new network to connect by using...
Sanket Padawe [Mon, 24 Aug 2015 18:12:57 +0000 (18:12 +0000)]
am 8b58dc57: am 1a9626f0: am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev

* commit '8b58dc577cc86af08f350c46f7059566fdc54961':
  Avoid new network to connect by using "Add Network" instead only Save it.

8 years agoam 1a9626f0: am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network...
Sanket Padawe [Mon, 24 Aug 2015 18:05:59 +0000 (18:05 +0000)]
am 1a9626f0: am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev

* commit '1a9626f056d253aa25fca561010624c463bbf9a9':
  Avoid new network to connect by using "Add Network" instead only Save it.

8 years agoam 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only...
Sanket Padawe [Mon, 24 Aug 2015 17:59:07 +0000 (17:59 +0000)]
am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev

* commit '3be6d0b44bf1152be0bc11bf6bacf750e1028b49':
  Avoid new network to connect by using "Add Network" instead only Save it.

8 years agoMerge "Avoid new network to connect by using "Add Network" instead only Save it....
Sanket Padawe [Mon, 24 Aug 2015 17:52:51 +0000 (17:52 +0000)]
Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev

8 years agoam 8466a365: (-s ours) am d8fd1cd7: (-s ours) am 9a86c085: (-s ours) Import translati...
Geoff Mendal [Mon, 24 Aug 2015 16:54:53 +0000 (16:54 +0000)]
am 8466a365: (-s ours) am d8fd1cd7: (-s ours) am 9a86c085: (-s ours) Import translations. DO NOT MERGE

* commit '8466a365b3dca0f3a8a9392c8d57843b417963c0':
  Import translations. DO NOT MERGE

8 years agoam d8fd1cd7: (-s ours) am 9a86c085: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Aug 2015 14:41:35 +0000 (14:41 +0000)]
am d8fd1cd7: (-s ours) am 9a86c085: (-s ours) Import translations. DO NOT MERGE

* commit 'd8fd1cd7d93ff4a86ae0277b2fb27c864eca252d':
  Import translations. DO NOT MERGE

8 years agoam 9a86c085: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Aug 2015 14:29:57 +0000 (14:29 +0000)]
am 9a86c085: (-s ours) Import translations. DO NOT MERGE

* commit '9a86c08593d8fd3e5bb4a20f1705c3a803e67a5e':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Aug 2015 14:16:24 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE

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

8 years agoDon't attempt to remove fp templates if none are enrolled
Jim Miller [Sat, 22 Aug 2015 01:07:50 +0000 (18:07 -0700)]
Don't attempt to remove fp templates if none are enrolled

The code was blindly calling fpm.remove(0) to remove all
fingerprint templates and then waiting for them to be removed.

Fixes bug 23183484

Change-Id: Ie510097d85bba32d965ba3c7f324f6c042e08300

8 years agoam b20e1b6c: am c9d5bfcb: am 5d187aa4: am ffe701dc: Present the security patch date...
Christopher Tate [Sat, 22 Aug 2015 00:41:22 +0000 (00:41 +0000)]
am b20e1b6c: am c9d5bfcb: am 5d187aa4: am ffe701dc: Present the security patch date in a human-friendly format

* commit 'b20e1b6cca89eff91bc63b8918e8f75d450a5854':
  Present the security patch date in a human-friendly format

8 years agoam c9d5bfcb: am 5d187aa4: am ffe701dc: Present the security patch date in a human...
Christopher Tate [Sat, 22 Aug 2015 00:27:20 +0000 (00:27 +0000)]
am c9d5bfcb: am 5d187aa4: am ffe701dc: Present the security patch date in a human-friendly format

* commit 'c9d5bfcb96ae8b1ed6128c03b4f9efd10d6f3b40':
  Present the security patch date in a human-friendly format

8 years agoam 5d187aa4: am ffe701dc: Present the security patch date in a human-friendly format
Christopher Tate [Sat, 22 Aug 2015 00:16:24 +0000 (00:16 +0000)]
am 5d187aa4: am ffe701dc: Present the security patch date in a human-friendly format

* commit '5d187aa43d262582241cd3a7097fc2fda0c875e6':
  Present the security patch date in a human-friendly format

8 years agoAvoid new network to connect by using "Add Network" instead only Save it.
Sanket Padawe [Fri, 21 Aug 2015 23:45:30 +0000 (16:45 -0700)]
Avoid new network to connect by using "Add Network" instead only Save it.

Bug: 23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d

8 years agoam ffe701dc: Present the security patch date in a human-friendly format
Christopher Tate [Fri, 21 Aug 2015 19:26:07 +0000 (19:26 +0000)]
am ffe701dc: Present the security patch date in a human-friendly format

* commit 'ffe701dc0e52ee95bf6c54291ed1b574d389019c':
  Present the security patch date in a human-friendly format

8 years agoPresent the security patch date in a human-friendly format
Christopher Tate [Thu, 20 Aug 2015 23:38:37 +0000 (16:38 -0700)]
Present the security patch date in a human-friendly format

For example, for an ISO date of 2015-08-01, this now displays
"August 1, 2015" in enUS, and "1 August 2015" in enUK, and
"2015年8月1日" in jpJP.

Bug 23358065

Change-Id: Iaa920ec88d765a222f0b589123665b689bf41978

8 years agoam 6ee587a0: am a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation...
Selim Cinek [Thu, 20 Aug 2015 19:28:36 +0000 (19:28 +0000)]
am 6ee587a0: am a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation limits

* commit '6ee587a01d74ef0aa813f2057989b59ed061e9df':
  Adapted string length translation limits

8 years agoam a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation limits
Selim Cinek [Thu, 20 Aug 2015 19:19:32 +0000 (19:19 +0000)]
am a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation limits

* commit 'a5e3aca4f8d49d1b4b092d8353e117ed77ac2e8a':
  Adapted string length translation limits

8 years agoam dba47d0c: am 19551115: Adapted string length translation limits
Selim Cinek [Thu, 20 Aug 2015 19:11:58 +0000 (19:11 +0000)]
am dba47d0c: am 19551115: Adapted string length translation limits

* commit 'dba47d0c7fe5c3b21d4b274cfdd9a84232644395':
  Adapted string length translation limits

8 years agoam 19551115: Adapted string length translation limits
Selim Cinek [Thu, 20 Aug 2015 19:04:30 +0000 (19:04 +0000)]
am 19551115: Adapted string length translation limits

* commit '19551115dbb3d848be084462342d41addeb1caf6':
  Adapted string length translation limits

8 years agoAdapted string length translation limits
Selim Cinek [Thu, 20 Aug 2015 18:53:47 +0000 (11:53 -0700)]
Adapted string length translation limits

Bug: 23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70

8 years agoam 537b5d6e: am 4d06defe: am d809de88: Merge "[Fingerprint] Smaller enrolling ring...
Maurice Lam [Thu, 20 Aug 2015 00:13:21 +0000 (00:13 +0000)]
am 537b5d6e: am 4d06defe: am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev

* commit '537b5d6eaea1d042fa915ef01016cfd8f88161fe':
  [Fingerprint] Smaller enrolling ring

8 years agoam 4d06defe: am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
Maurice Lam [Thu, 20 Aug 2015 00:08:43 +0000 (00:08 +0000)]
am 4d06defe: am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev

* commit '4d06defe88b46ec877e0bb6e1ac095bd650ab9df':
  [Fingerprint] Smaller enrolling ring

8 years agoam d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
Maurice Lam [Wed, 19 Aug 2015 23:59:13 +0000 (23:59 +0000)]
am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev

* commit 'd809de884761f290a94f01f21b5c94e262ec22ea':
  [Fingerprint] Smaller enrolling ring

8 years agoMerge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
Maurice Lam [Wed, 19 Aug 2015 23:51:30 +0000 (23:51 +0000)]
Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev

8 years agoam 1042f538: (-s ours) am 9c989954: (-s ours) am a206a162: (-s ours) Merge "Import...
Geoff Mendal [Wed, 19 Aug 2015 14:31:29 +0000 (14:31 +0000)]
am 1042f538: (-s ours) am 9c989954: (-s ours) am a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '1042f538a2769fcd6e70453660872a7a9ca8dc74':
  Import translations. DO NOT MERGE

8 years agoam 9c989954: (-s ours) am a206a162: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 19 Aug 2015 14:20:55 +0000 (14:20 +0000)]
am 9c989954: (-s ours) am a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '9c98995468e530f8c0d925ce3b5285756930224e':
  Import translations. DO NOT MERGE

8 years agoam 22ab07ea: am f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard
Paul Lawrence [Wed, 19 Aug 2015 14:20:31 +0000 (14:20 +0000)]
am 22ab07ea: am f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard

* commit '22ab07ea8fbb44eb9f461d0fb31431e05d6671ad':
  Stop crash on repeated enters on virtual keyboard

8 years agoam a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 19 Aug 2015 14:15:27 +0000 (14:15 +0000)]
am a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'a206a162d1a55e7c440c125b504bef83eb361c84':
  Import translations. DO NOT MERGE

8 years agoam f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard
Paul Lawrence [Wed, 19 Aug 2015 14:15:07 +0000 (14:15 +0000)]
am f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard

* commit 'f7f0a85fe6c7d68a127f42e3528ef81050f8dd0c':
  Stop crash on repeated enters on virtual keyboard

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 19 Aug 2015 14:09:16 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoam 1f8fb0f8: Stop crash on repeated enters on virtual keyboard
Paul Lawrence [Wed, 19 Aug 2015 14:08:36 +0000 (14:08 +0000)]
am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard

* commit '1f8fb0f8ce1e82266a3a12b3d31b9062cff3fc44':
  Stop crash on repeated enters on virtual keyboard