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
620374492f
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:41 +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
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
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
356e5b585c
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:32 +00: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
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
c877856a05
am 19551115
: Adapted string length translation limits
...
* commit '19551115dbb3d848be084462342d41addeb1caf6':
Adapted string length translation limits
2015-08-20 19:06:47 +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
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
Geoff Mendal
a835a8cf1b
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
2015-08-19 14:31:29 +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
Paul Lawrence
182b4263d3
am 22ab07ea
: am f7f0a85f
: am 1f8fb0f8
: Stop crash on repeated enters on virtual keyboard
...
* commit '22ab07ea8fbb44eb9f461d0fb31431e05d6671ad':
Stop crash on repeated enters on virtual keyboard
2015-08-19 14:20:31 +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
Paul Lawrence
f7f0a85fe6
am 1f8fb0f8
: Stop crash on repeated enters on virtual keyboard
...
* commit '1f8fb0f8ce1e82266a3a12b3d31b9062cff3fc44':
Stop crash on repeated enters on virtual keyboard
2015-08-19 14:08:36 +00:00
Geoff Mendal
d401a062c7
Import translations. DO NOT MERGE
...
Change-Id: I9ab62b9e28b5dd6f8cd2a54e1ae7e015b8730e03
Auto-generated-cl: translation import
2015-08-19 07:08:00 -07:00
Maurice Lam
27fa865db7
[Fingerprint] Smaller enrolling ring
...
Make the enrolling progress ring smaller in sw400dp during setup.
Bug: 23216520
Change-Id: I01a862baf9ea3e75e2164d12b7ef13dee5f28c5a
2015-08-18 18:30:36 -07:00
Paul Lawrence
1f8fb0f8ce
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
2015-08-18 16:25:00 +00:00
Zachary Kuznia
5adcb3d353
Allow manual to be read from disk
...
b/22891924
Change-Id: I6014690735403b772f273addba01706441898e23
2015-08-17 18:20:37 -07:00
Julia Reynolds
c1682e0a72
am 904a7e96
: am db4a029f
: am 62fdd558
: am 0ece6a32
: String update for battery details page.
...
* commit '904a7e96a9c8023cd4a24c73a5f77659b48f04d8':
String update for battery details page.
2015-08-17 17:47:29 +00:00
Julia Reynolds
904a7e96a9
am db4a029f
: am 62fdd558
: am 0ece6a32
: String update for battery details page.
...
* commit 'db4a029f66092ee8497775e434c21fee7dbda486':
String update for battery details page.
2015-08-17 17:39:38 +00:00
Julia Reynolds
db4a029f66
am 62fdd558
: am 0ece6a32
: String update for battery details page.
...
* commit '62fdd5581e131731651e4afb96bedd8092ffd9cc':
String update for battery details page.
2015-08-17 17:32:26 +00:00
Julia Reynolds
62fdd5581e
am 0ece6a32
: String update for battery details page.
...
* commit '0ece6a3241062842db991ad63add899369ce1853':
String update for battery details page.
2015-08-17 17:26:19 +00:00
Julia Reynolds
42f2b35435
am 0ece6a32
: String update for battery details page.
...
* commit '0ece6a3241062842db991ad63add899369ce1853':
String update for battery details page.
2015-08-17 17:24:56 +00:00
Julia Reynolds
0ece6a3241
String update for battery details page.
...
Bug: 22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90
2015-08-17 13:14:38 -04:00
Chris Wren
e932cf23a8
am a18e6ffe
: am 8b98ef6f
: am 15ff8af7
: Merge "instrument fingerprint settings" into mnc-dr-dev
...
* commit 'a18e6ffe9a3c53daa57d622965f594b56dd559a5':
instrument fingerprint settings
2015-08-17 17:09:47 +00:00
Chris Wren
a18e6ffe9a
am 8b98ef6f
: am 15ff8af7
: Merge "instrument fingerprint settings" into mnc-dr-dev
...
* commit '8b98ef6fd80c300e327b9f189ac800492f8cb9f5':
instrument fingerprint settings
2015-08-17 17:01:58 +00:00
Chris Wren
8b98ef6fd8
am 15ff8af7
: Merge "instrument fingerprint settings" into mnc-dr-dev
...
* commit '15ff8af7a7cec3c55dde81419b0522fc4adcbeb1':
instrument fingerprint settings
2015-08-17 16:52:25 +00:00
Chris Wren
15ff8af7a7
Merge "instrument fingerprint settings" into mnc-dr-dev
2015-08-17 16:47:56 +00:00