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
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
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
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
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
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
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
Julia Reynolds
f4d67027d6
Merge "Make the app header bar more consistent."
2015-08-19 19:27:50 +00:00
Julia Reynolds
e492ee06ad
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
2015-08-19 15:18:55 -04:00
Paul Lawrence
b075cf50ce
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
2015-08-19 14:28:46 +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
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
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
Julia Reynolds
b7237a1457
Index account settings for settings search.
...
Bug: 19390455
Change-Id: Ie55c46788b010dc920b06b38008baad3ed37600a
2015-08-18 10:36:11 -04: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
4ffebed985
am c1682e0a
: am 904a7e96
: am db4a029f
: am 62fdd558
: am 0ece6a32
: String update for battery details page.
...
* commit 'c1682e0a7270f7805267f7cfaa66a2d22a8d83df':
String update for battery details page.
2015-08-17 17:57:03 +00: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
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
Chris Wren
3be9b031b2
am e932cf23
: am a18e6ffe
: am 8b98ef6f
: am 15ff8af7
: Merge "instrument fingerprint settings" into mnc-dr-dev
...
* commit 'e932cf23a8e587c32b100e72bc8c9a1c4bb835b7':
instrument fingerprint settings
2015-08-17 17:16:08 +00:00
Julia Reynolds
646bee6157
Merge "Add null check when loading restricted profile apps."
2015-08-17 17:15:34 +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
Julia Reynolds
d7faba5c25
Add null check when loading restricted profile apps.
...
In case the profile is being deleted.
Bug: 22235449
Change-Id: Ia67deb4e578edf79079ddc308b0750327c1ff85d
2015-08-17 13:09:47 -04: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
Jason Monk
38d1b86e09
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
2015-08-17 16:26:46 +00:00
Jason Monk
12a4d0313f
am 51ba8b47
: am 99df2376
: am 9d59a244
: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
...
* commit '51ba8b47f501d5fe5915a997507aba2fc246012e':
Fix Usb-C dialog issues
2015-08-17 15:49:39 +00:00
Jason Monk
99df2376a1
am 9d59a244
: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
...
* commit '9d59a2441ee59b0fe74f49cb12de3af2cab89da1':
Fix Usb-C dialog issues
2015-08-17 15:35:45 +00:00
Jason Monk
9d59a2441e
Merge "Fix Usb-C dialog issues" into mnc-dr-dev
2015-08-17 15:29:52 +00:00
Adam Lesinski
516ee46c48
Merge commit 'f34d3111' into manualmerge
...
Change-Id: I4bc1b449c4b48b6f295035457b66b95e180c6ddd
2015-08-14 14:22:48 -07:00
Jeff Sharkey
edf038205e
am a334d530
: am b38493cc
: am b0f9e9d4
: am 82fee7bd
: am b4158f0e
: Merge "Only offer migration between private volumes." into mnc-dev
...
* commit 'a334d53025fbbf187f5aad5abf61091f9c994e01':
Only offer migration between private volumes.
2015-08-14 21:12:58 +00:00
Julia Reynolds
6987152c47
Merge "Allow admins to remove users."
2015-08-14 20:23:23 +00:00
Julia Reynolds
2ed24d3db6
Merge "Fix crash creating notification lockscreen setting."
2015-08-14 20:20:39 +00:00