Maurice Lam
07c2561d80
am 8cea65f9
: am 3087a4e0
: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '8cea65f99f23c1a86d7a760b2dba89fa83036959':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:31:35 +00:00
Maurice Lam
8cea65f99f
am 3087a4e0
: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '3087a4e0fd792531e567c7b508dd1e65b7fcf515':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:24:52 +00:00
Maurice Lam
3087a4e0fd
Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
2015-08-28 22:13:19 +00:00
Maurice Lam
48cf33a94e
[Fingerprint] Add skip dialog during SUW
...
During setup wizard, add a skip dialog to confirm whether the user
wants to skip fingerprint setup or not.
Bug: 23228889
Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
2015-08-28 12:39:21 -07:00
Geoff Mendal
c350e4e133
am 15f11ef2
: (-s ours) am fea2b30a
: (-s ours) am 37dfaa13
: (-s ours) Import translations. DO NOT MERGE
...
* commit '15f11ef2470d231d495dec7df6410952f07073c2':
Import translations. DO NOT MERGE
2015-08-28 10:25:32 +00:00
Geoff Mendal
15f11ef247
am fea2b30a
: (-s ours) am 37dfaa13
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fea2b30ac49e5075a4cc78c1e694a62334192f0a':
Import translations. DO NOT MERGE
2015-08-28 10:21:01 +00:00
Geoff Mendal
e6d06aeb2c
am 2751a8cf
: (-s ours) am db044ffb
: (-s ours) Import translations. DO NOT MERGE
...
* commit '2751a8cf319c58f83564ff9eb5efbf5b32d2dc7f':
Import translations. DO NOT MERGE
2015-08-28 10:20:47 +00:00
Geoff Mendal
fea2b30ac4
am 37dfaa13
: (-s ours) Import translations. DO NOT MERGE
...
* commit '37dfaa13ec6882720ca100ef235a7649046aec12':
Import translations. DO NOT MERGE
2015-08-28 10:14:49 +00:00
Geoff Mendal
2751a8cf31
am db044ffb
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'db044ffbc6b90ba2730bfd7a97e0593e50d9b014':
Import translations. DO NOT MERGE
2015-08-28 10:13:21 +00:00
Geoff Mendal
db044ffbc6
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 23544168
Change-Id: Iade81d81334be9289e7381f05931257154f72a6f
2015-08-28 03:06:04 -07:00
Geoff Mendal
37dfaa13ec
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 23544168
Change-Id: I39c268e990f8cbb57fef7cec1a9a36ddac45f968
2015-08-28 03:02:07 -07:00
Xiyuan Xia
e053491bcc
am e927bd70
: am 43fe6dba
: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
...
* commit 'e927bd7014c34e6f368da9325fc78b2df5362a99':
Fix ChoosePat/Pin/Pwd crash from async task
2015-08-28 01:59:06 +00:00
Xiyuan Xia
e927bd7014
am 43fe6dba
: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
...
* commit '43fe6dba693f8f23ffd69c1ffcd3b5642266be58':
Fix ChoosePat/Pin/Pwd crash from async task
2015-08-28 01:52:26 +00:00
Xiyuan Xia
43fe6dba69
Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
2015-08-28 01:46:57 +00:00
Xiyuan Xia
3e7e3d6c59
Fix ChoosePat/Pin/Pwd crash from async task
...
Use a retained worker fragment to track the asynchronous
save-and-finish task so that ChoosePattern/Password activity
is properly dismissed after a configuration change.
Bug:23424884
Bug:23521530
Change-Id: I328022c1603cfb0f6812cd8aa7916ae7b72c9950
2015-08-27 13:35:55 -07:00
Geoff Mendal
ebf23a763f
am 3b545b41
: (-s ours) am fbfdede1
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3b545b41b931919fab3528e2bbb81ded620378b2':
Import translations. DO NOT MERGE
2015-08-26 14:25:58 +00:00
Geoff Mendal
3b545b41b9
am fbfdede1
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fbfdede15b6a81655a5b4fc274340ba58c3d4a99':
Import translations. DO NOT MERGE
2015-08-26 14:19:37 +00:00
Geoff Mendal
fbfdede15b
Import translations. DO NOT MERGE
...
Change-Id: I1d08cdfb6ad7723d4e0bd578b0b699fc9d2389db
Auto-generated-cl: translation import
2015-08-26 07:12:08 -07: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
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
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
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
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
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
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
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
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
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
Geoff Mendal
1042f538a2
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
2015-08-19 14:20:55 +00:00
Geoff Mendal
9c98995468
am a206a162
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'a206a162d1a55e7c440c125b504bef83eb361c84':
Import translations. DO NOT MERGE
2015-08-19 14:15:27 +00:00
Paul Lawrence
22ab07ea8f
am f7f0a85f
: am 1f8fb0f8
: Stop crash on repeated enters on virtual keyboard
...
* commit 'f7f0a85fe6c7d68a127f42e3528ef81050f8dd0c':
Stop crash on repeated enters on virtual keyboard
2015-08-19 14:15:07 +00:00
Geoff Mendal
a206a162d1
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-08-19 14:09:16 +00:00