Yasuhiro Matsuda
ea37281d9e
Merge "Handle the case where USB_STATE intent is not received yet."
2015-08-26 09:36:41 +00:00
Jim Miller
8b8ac00d84
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
2015-08-25 23:37:53 +00:00
Jim Miller
e3f8ef8333
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
2015-08-25 23:33:55 +00:00
Jim Miller
d63408d915
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
2015-08-25 23:25:08 +00:00
Jim Miller
d7e4cd9b1e
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
2015-08-25 23:18:54 +00:00
Jim Miller
f7fc642987
Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev
2015-08-25 23:08:55 +00:00
Wei Liu
9dde0669f2
am 656c805b
: am 70238114
: am 6e58d516
: Refactor UidDetailProvider and its dependencies to SettingsLib.
...
* commit '656c805bf38dd299ae25fbe39806650122aa6314':
Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:45:34 +00:00
Wei Liu
656c805bf3
am 70238114
: am 6e58d516
: Refactor UidDetailProvider and its dependencies to SettingsLib.
...
* commit '702381144781d68551e765dcf8b23cf3dbca3ce5':
Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:37:40 +00:00
Wei Liu
7023811447
am 6e58d516
: Refactor UidDetailProvider and its dependencies to SettingsLib.
...
* commit '6e58d516f05bbceabdddd3aa08a94fcc32858e71':
Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:32:41 +00:00
Wei Liu
f280a5ec5a
am dd65a1d9
: am ad50b81f
: am 0e309b86
: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
...
* commit 'dd65a1d98d46716069b6c2a58c2c268afbeb8ba6':
Move SummaryForAllUidLoader to SettingsLib.
2015-08-25 18:18:38 +00:00
Wei Liu
dd65a1d98d
am ad50b81f
: am 0e309b86
: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
...
* commit 'ad50b81f492fb01390679f697d1f340da35ef28c':
Move SummaryForAllUidLoader to SettingsLib.
2015-08-25 18:11:06 +00:00
Wei Liu
ad50b81f49
am 0e309b86
: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
...
* commit '0e309b867d1872b8cd0d6d435e10d6d3be48a3bd':
Move SummaryForAllUidLoader to SettingsLib.
2015-08-25 18:03:37 +00:00
Wei Liu
6e58d516f0
Refactor UidDetailProvider and its dependencies to SettingsLib.
...
so that it can be reused by Wear app data usage.
Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867
2015-08-25 11:02:59 -07:00
Wei Liu
0e309b867d
Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
2015-08-25 17:55:31 +00:00
Sanket Padawe
fea726a1be
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.
2015-08-24 23:38:53 +00:00
Wei Liu
8dffd150c4
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
2015-08-24 11:47:27 -07:00
Sanket Padawe
481df58d49
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.
2015-08-24 18:21:51 +00:00
Sanket Padawe
226dec509d
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.
2015-08-24 18:12:57 +00:00
Sanket Padawe
8b58dc577c
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.
2015-08-24 18:05:59 +00:00
Sanket Padawe
1a9626f056
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.
2015-08-24 17:59:07 +00:00
Sanket Padawe
3be6d0b44b
Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
2015-08-24 17:52:51 +00:00
Geoff Mendal
98aa4413f6
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
2015-08-24 17:03:16 +00:00
Geoff Mendal
f81d8a615d
am 8466a365
: (-s ours) am d8fd1cd7
: (-s ours) am 9a86c085
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8466a365b3dca0f3a8a9392c8d57843b417963c0':
Import translations. DO NOT MERGE
2015-08-24 16:54:53 +00:00
Geoff Mendal
8466a365b3
am d8fd1cd7
: (-s ours) am 9a86c085
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd8fd1cd7d93ff4a86ae0277b2fb27c864eca252d':
Import translations. DO NOT MERGE
2015-08-24 14:41:35 +00:00
Geoff Mendal
d8fd1cd7d9
am 9a86c085
: (-s ours) Import translations. DO NOT MERGE
...
* commit '9a86c08593d8fd3e5bb4a20f1705c3a803e67a5e':
Import translations. DO NOT MERGE
2015-08-24 14:29:57 +00:00
Geoff Mendal
9a86c08593
Import translations. DO NOT MERGE
...
Change-Id: I14e14a1e5f548b559939584de4a209990318f799
Auto-generated-cl: translation import
2015-08-24 07:16:24 -07:00
Geoff Mendal
51da0c2917
Import translations. DO NOT MERGE
...
Change-Id: Id4904959b7d44389738951332e67247f76ca61cd
Auto-generated-cl: translation import
2015-08-24 06:22:32 -07:00
Christopher Tate
51b3b8a20e
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
2015-08-22 01:38:14 +00:00
Jim Miller
c2f6813a83
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
2015-08-21 18:07:50 -07:00
Christopher Tate
435d6f2ea0
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
2015-08-22 00:41:22 +00:00
Christopher Tate
b20e1b6cca
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
2015-08-22 00:27:20 +00:00
Christopher Tate
c9d5bfcb96
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
2015-08-22 00:16:24 +00:00
Sanket Padawe
e0ece963c6
Avoid new network to connect by using "Add Network" instead only Save it.
...
Bug: 23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d
2015-08-21 16:45:30 -07:00
Christopher Tate
5d187aa43d
am ffe701dc
: Present the security patch date in a human-friendly format
...
* commit 'ffe701dc0e52ee95bf6c54291ed1b574d389019c':
Present the security patch date in a human-friendly format
2015-08-21 19:26:07 +00:00
Christopher Tate
ffe701dc0e
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
2015-08-20 17:16:08 -07:00
Selim Cinek
494bcecba5
am c118c90c
: am 6ee587a0
: am a5e3aca4
: am dba47d0c
: am 19551115
: Adapted string length translation limits
...
* commit 'c118c90c9bda1bdea7f84469988670fab7b48c61':
Adapted string length translation limits
2015-08-20 19:59:55 +00:00
Selim Cinek
c118c90c9b
am 6ee587a0
: am a5e3aca4
: am dba47d0c
: am 19551115
: Adapted string length translation limits
...
* commit '6ee587a01d74ef0aa813f2057989b59ed061e9df':
Adapted string length translation limits
2015-08-20 19:28:36 +00:00
Selim Cinek
6ee587a01d
am a5e3aca4
: am dba47d0c
: am 19551115
: Adapted string length translation limits
...
* commit 'a5e3aca4f8d49d1b4b092d8353e117ed77ac2e8a':
Adapted string length translation limits
2015-08-20 19:19:32 +00:00
Selim Cinek
a5e3aca4f8
am dba47d0c
: am 19551115
: Adapted string length translation limits
...
* commit 'dba47d0c7fe5c3b21d4b274cfdd9a84232644395':
Adapted string length translation limits
2015-08-20 19:11:58 +00:00
Selim Cinek
dba47d0c7f
am 19551115
: Adapted string length translation limits
...
* commit '19551115dbb3d848be084462342d41addeb1caf6':
Adapted string length translation limits
2015-08-20 19:04:30 +00:00
Selim Cinek
19551115db
Adapted string length translation limits
...
Bug: 23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
2015-08-20 18:57:22 +00:00
Jason Monk
5711e73146
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
2015-08-20 18:13:52 +00:00
Julia Reynolds
975645c0ca
Reduce jank on 'touch sounds' switch.
...
Bug: 23360053
Change-Id: Iec47e1464cfa0bd53f40977f7fa58c37dd635853
2015-08-20 10:42:14 -04:00
Maurice Lam
6ead34139c
am 1b060c09
: am 537b5d6e
: am 4d06defe
: am d809de88
: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
...
* commit '1b060c09f64ce953fafb52fb5a373ff0256de881':
[Fingerprint] Smaller enrolling ring
2015-08-20 00:20:07 +00:00
Maurice Lam
1b060c09f6
am 537b5d6e
: am 4d06defe
: am d809de88
: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
...
* commit '537b5d6eaea1d042fa915ef01016cfd8f88161fe':
[Fingerprint] Smaller enrolling ring
2015-08-20 00:13:21 +00:00
Maurice Lam
537b5d6eae
am 4d06defe
: am d809de88
: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
...
* commit '4d06defe88b46ec877e0bb6e1ac095bd650ab9df':
[Fingerprint] Smaller enrolling ring
2015-08-20 00:08:43 +00:00
Maurice Lam
4d06defe88
am d809de88
: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
...
* commit 'd809de884761f290a94f01f21b5c94e262ec22ea':
[Fingerprint] Smaller enrolling ring
2015-08-19 23:59:13 +00:00
Maurice Lam
d809de8847
Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
2015-08-19 23:51:30 +00:00
Julia Reynolds
0a1b513f70
Merge "Fix settings crash during factory reset."
2015-08-19 20:40:35 +00:00
Julia Reynolds
8a38801bcf
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
2015-08-19 16:19:55 -04:00