OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoam cf82dbec: am 31d519fe: (-s ours) am 66b5a58a: Merge "Fix init order so we have...
Jeff Sharkey [Thu, 27 Aug 2015 20:14:47 +0000 (20:14 +0000)]
am cf82dbec: am 31d519fe: (-s ours) am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev

* commit 'cf82dbec38e70aa9a4ae0eb99ad4cbf4b7ae6d83':

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

* commit '22bf2806b4bfe4d31d94c2adbfa2d4bac3b25d9f':

8 years agoam 19f5403a: (-s ours) am 479b00cd: (-s ours) am e21573da: (-s ours) Import translati...
Geoff Mendal [Thu, 27 Aug 2015 20:14:44 +0000 (20:14 +0000)]
am 19f5403a: (-s ours) am 479b00cd: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE

* commit '19f5403aedfc6e0ac66fa92422096890cdbe49b5':

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 agoMerge "Use common extra names when launching external config."
Julia Reynolds [Wed, 26 Aug 2015 18:47:08 +0000 (18:47 +0000)]
Merge "Use common extra names when launching external config."

8 years agoMerge "Renamed primaryUserOnly to systemUserOnly"
Fyodor Kupolov [Wed, 26 Aug 2015 17:25:52 +0000 (17:25 +0000)]
Merge "Renamed primaryUserOnly to systemUserOnly"

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

* commit '6d9b908a31702ff1d6d8ea98ad1817c58fbeaf12':
  Import translations. DO NOT MERGE

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 agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 13:21:28 +0000 (06:21 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Handle the case where null is returned for USB_STATE intent."
Yasuhiro Matsuda [Wed, 26 Aug 2015 09:36:41 +0000 (09:36 +0000)]
Merge "Handle the case where null is returned for USB_STATE intent."

8 years agoMerge "Handle the case where USB_STATE intent is not received yet."
Yasuhiro Matsuda [Wed, 26 Aug 2015 09:36:41 +0000 (09:36 +0000)]
Merge "Handle the case where USB_STATE intent is not received yet."

8 years agoRenamed primaryUserOnly to systemUserOnly
Fyodor Kupolov [Tue, 25 Aug 2015 17:16:07 +0000 (10:16 -0700)]
Renamed primaryUserOnly to systemUserOnly

Bug: 22958572
Change-Id: Iaea879e76ec24c1b18446addd4d575514c94625b

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

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

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 agoUse common extra names when launching external config.
Julia Reynolds [Tue, 25 Aug 2015 18:55:54 +0000 (14:55 -0400)]
Use common extra names when launching external config.

Bug: 22977552
Change-Id: Ib91bcea76598cb5e712ad0c1f0a5cd1f9dc16fbe

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

* commit '656c805bf38dd299ae25fbe39806650122aa6314':
  Refactor UidDetailProvider and its dependencies to SettingsLib.

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 dd65a1d9: am ad50b81f: am 0e309b86: Merge "Move SummaryForAllUidLoader to Settings...
Wei Liu [Tue, 25 Aug 2015 18:18:38 +0000 (18:18 +0000)]
am dd65a1d9: am ad50b81f: am 0e309b86: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev

* commit 'dd65a1d98d46716069b6c2a58c2c268afbeb8ba6':
  Move SummaryForAllUidLoader 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 agoam 481df58d: am 226dec50: am 8b58dc57: am 1a9626f0: am 3be6d0b4: Merge "Avoid new...
Sanket Padawe [Mon, 24 Aug 2015 23:38:53 +0000 (23:38 +0000)]
am 481df58d: 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 '481df58d49cb37080899ecfe21a22c13943701b2':
  Avoid new network to connect by using "Add Network" instead only Save it.

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 f81d8a61: (-s ours) am 8466a365: (-s ours) am d8fd1cd7: (-s ours) am 9a86c085...
Geoff Mendal [Mon, 24 Aug 2015 17:03:16 +0000 (17:03 +0000)]
am f81d8a61: (-s ours) am 8466a365: (-s ours) am d8fd1cd7: (-s ours) am 9a86c085: (-s ours) Import translations. DO NOT MERGE

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

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 agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Aug 2015 13:22:32 +0000 (06:22 -0700)]
Import translations. DO NOT MERGE

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

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

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

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 c118c90c: am 6ee587a0: am a5e3aca4: am dba47d0c: am 19551115: Adapted string lengt...
Selim Cinek [Thu, 20 Aug 2015 19:59:55 +0000 (19:59 +0000)]
am c118c90c: am 6ee587a0: am a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation limits

* commit 'c118c90c9bda1bdea7f84469988670fab7b48c61':
  Adapted string length translation limits

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 agoPossibly fix apps loading forever
Jason Monk [Tue, 11 Aug 2015 13:41:42 +0000 (09:41 -0400)]
Possibly fix apps loading forever

 - Consistently handle results from filters whether async or not
 - Make sure we trigger a rebuild after loading entries is complete

Bug: 22838302
Change-Id: I4595c61d4ea7069e59440c9dc673a1f0b73bc864

8 years agoReduce jank on 'touch sounds' switch.
Julia Reynolds [Thu, 20 Aug 2015 14:08:07 +0000 (10:08 -0400)]
Reduce jank on 'touch sounds' switch.

Bug: 23360053
Change-Id: Iec47e1464cfa0bd53f40977f7fa58c37dd635853

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

* commit '1b060c09f64ce953fafb52fb5a373ff0256de881':
  [Fingerprint] Smaller enrolling ring

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 agoMerge "Fix settings crash during factory reset."
Julia Reynolds [Wed, 19 Aug 2015 20:40:35 +0000 (20:40 +0000)]
Merge "Fix settings crash during factory reset."

8 years agoFix settings crash during factory reset.
Julia Reynolds [Wed, 19 Aug 2015 20:19:55 +0000 (16:19 -0400)]
Fix settings crash during factory reset.

If you close and then launch settings before the persistent
data block wipe is finished.
Bug: 20458454

Change-Id: I07bf79f25bcb30ac8932925aa7b77b9a95d16e20

8 years agoMerge "Make the app header bar more consistent."
Julia Reynolds [Wed, 19 Aug 2015 19:27:50 +0000 (19:27 +0000)]
Merge "Make the app header bar more consistent."

8 years agoMake the app header bar more consistent.
Julia Reynolds [Wed, 19 Aug 2015 14:21:52 +0000 (10:21 -0400)]
Make the app header bar more consistent.

- Don't include info link if just came from app info page
- include back button on app info page when launched from header
Bug: 22203029

Change-Id: I737332a487c41e0a93d161b55659700a1f936844

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

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

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 182b4263: am 22ab07ea: am f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters...
Paul Lawrence [Wed, 19 Aug 2015 14:28:46 +0000 (14:28 +0000)]
am 182b4263: am 22ab07ea: am f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard

* commit '182b4263d302e869492e43e9222d35aa301949e2':
  Stop crash on repeated enters on virtual keyboard

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

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

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 13:14:20 +0000 (06:14 -0700)]
Import translations. DO NOT MERGE

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

8 years ago[Fingerprint] Smaller enrolling ring
Maurice Lam [Wed, 19 Aug 2015 01:30:36 +0000 (18:30 -0700)]
[Fingerprint] Smaller enrolling ring

Make the enrolling progress ring smaller in sw400dp during setup.

Bug: 23216520
Change-Id: I01a862baf9ea3e75e2164d12b7ef13dee5f28c5a

8 years agoStop crash on repeated enters on virtual keyboard
Paul Lawrence [Wed, 12 Aug 2015 20:49:34 +0000 (13:49 -0700)]
Stop crash on repeated enters on virtual keyboard

Change https://googleplex-android-review.git.corp.google.com/#/c/742462/
removed the mDone since graying out the button seemed to remove the need
for this. However, you can also enter this command repeatedly from the
soft keyboard.

Put mDone back.

Bug: 23181625
Change-Id: I42e8ecb9824b17825778c9c113130506cc3a200b

8 years agoIndex account settings for settings search.
Julia Reynolds [Tue, 18 Aug 2015 12:31:11 +0000 (08:31 -0400)]
Index account settings for settings search.

Bug: 19390455
Change-Id: Ie55c46788b010dc920b06b38008baad3ed37600a

8 years agoam c1682e0a: am 904a7e96: am db4a029f: am 62fdd558: am 0ece6a32: String update for...
Julia Reynolds [Mon, 17 Aug 2015 17:57:03 +0000 (17:57 +0000)]
am c1682e0a: am 904a7e96: am db4a029f: am 62fdd558: am 0ece6a32: String update for battery details page.

* commit 'c1682e0a7270f7805267f7cfaa66a2d22a8d83df':
  String update for battery details page.

8 years agoam 904a7e96: am db4a029f: am 62fdd558: am 0ece6a32: String update for battery details...
Julia Reynolds [Mon, 17 Aug 2015 17:47:29 +0000 (17:47 +0000)]
am 904a7e96: am db4a029f: am 62fdd558: am 0ece6a32: String update for battery details page.

* commit '904a7e96a9c8023cd4a24c73a5f77659b48f04d8':
  String update for battery details page.

8 years agoam db4a029f: am 62fdd558: am 0ece6a32: String update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:39:38 +0000 (17:39 +0000)]
am db4a029f: am 62fdd558: am 0ece6a32: String update for battery details page.

* commit 'db4a029f66092ee8497775e434c21fee7dbda486':
  String update for battery details page.

8 years agoam 62fdd558: am 0ece6a32: String update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:32:26 +0000 (17:32 +0000)]
am 62fdd558: am 0ece6a32: String update for battery details page.

* commit '62fdd5581e131731651e4afb96bedd8092ffd9cc':
  String update for battery details page.

8 years agoam 0ece6a32: String update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:26:19 +0000 (17:26 +0000)]
am 0ece6a32: String update for battery details page.

* commit '0ece6a3241062842db991ad63add899369ce1853':
  String update for battery details page.

8 years agoam e932cf23: am a18e6ffe: am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint...
Chris Wren [Mon, 17 Aug 2015 17:16:08 +0000 (17:16 +0000)]
am e932cf23: am a18e6ffe: am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev

* commit 'e932cf23a8e587c32b100e72bc8c9a1c4bb835b7':
  instrument fingerprint settings

8 years agoMerge "Add null check when loading restricted profile apps."
Julia Reynolds [Mon, 17 Aug 2015 17:15:34 +0000 (17:15 +0000)]
Merge "Add null check when loading restricted profile apps."

8 years agoString update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:14:38 +0000 (13:14 -0400)]
String update for battery details page.

Bug: 22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90

8 years agoam a18e6ffe: am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into...
Chris Wren [Mon, 17 Aug 2015 17:09:47 +0000 (17:09 +0000)]
am a18e6ffe: am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev

* commit 'a18e6ffe9a3c53daa57d622965f594b56dd559a5':
  instrument fingerprint settings

8 years agoAdd null check when loading restricted profile apps.
Julia Reynolds [Mon, 17 Aug 2015 17:09:47 +0000 (13:09 -0400)]
Add null check when loading restricted profile apps.

In case the profile is being deleted.
Bug: 22235449

Change-Id: Ia67deb4e578edf79079ddc308b0750327c1ff85d

8 years agoam 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev
Chris Wren [Mon, 17 Aug 2015 17:01:58 +0000 (17:01 +0000)]
am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev

* commit '8b98ef6fd80c300e327b9f189ac800492f8cb9f5':
  instrument fingerprint settings

8 years agoam 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev
Chris Wren [Mon, 17 Aug 2015 16:52:25 +0000 (16:52 +0000)]
am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev

* commit '15ff8af7a7cec3c55dde81419b0522fc4adcbeb1':
  instrument fingerprint settings

8 years agoMerge "instrument fingerprint settings" into mnc-dr-dev
Chris Wren [Mon, 17 Aug 2015 16:47:56 +0000 (16:47 +0000)]
Merge "instrument fingerprint settings" into mnc-dr-dev

8 years agoam 12a4d031: am 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues...
Jason Monk [Mon, 17 Aug 2015 16:26:46 +0000 (16:26 +0000)]
am 12a4d031: am 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev

* commit '12a4d0313f8e964b727484448bd9b4ed8af1dc5f':
  Fix Usb-C dialog issues

8 years agoam 4c36f443: (-s ours) am f1ad264c: (-s ours) am 7533cd47: (-s ours) am 3c274207...
Geoff Mendal [Mon, 17 Aug 2015 16:26:28 +0000 (16:26 +0000)]
am 4c36f443: (-s ours) am f1ad264c: (-s ours) am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE

* commit '4c36f443a368a0409203612a331cbc928d2485dd':
  Import translations. DO NOT MERGE

8 years agoam 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
Jason Monk [Mon, 17 Aug 2015 15:49:39 +0000 (15:49 +0000)]
am 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev

* commit '51ba8b47f501d5fe5915a997507aba2fc246012e':
  Fix Usb-C dialog issues

8 years agoam 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
Jason Monk [Mon, 17 Aug 2015 15:41:16 +0000 (15:41 +0000)]
am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev

* commit '99df2376a161d1a1328b64dfd2451aeb2c50e532':
  Fix Usb-C dialog issues