PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,673 Commits 1 Branch 0 Tags
2af5aa09a0e8506c64a544dc74475b5ce5aaed1d
Commit Graph

9323 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
f34d31110f am b5ca40c6: am 11d1caed: am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 
* commit 'b5ca40c6442c4f30b79dcd202bb9fecc65ba436c':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs
 2015-08-14 20:01:51 +00:00
Adam Lesinski
11d1caede2 am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 
* commit 'e3ddd117a6bd6f25ea345349fe59be6a4ada3161':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs
 2015-08-14 19:47:43 +00:00
Chris Wren
1b8d5ffb47 instrument fingerprint settings 
instrument visibility on all fingerprint views
  rename and delete action
  add fingerprint action is implicit in flow

Bug: 22951001
Change-Id: I53f048f479e24754972b801598d5da393ba9d716
 2015-08-14 15:44:16 -04:00
Adam Lesinski
e3ddd117a6 am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 
* commit '3cc05c9d7e290b7e6ff10c3428c471b8e2529f2c':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs
 2015-08-14 19:43:40 +00:00
Adam Lesinski
3cc05c9d7e Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 2015-08-14 19:38:34 +00:00
Jeff Sharkey
a334d53025 am b38493cc: am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit 'b38493cc6c52346edbcb045a67b1f4831a80290e':
  Only offer migration between private volumes.
 2015-08-14 18:47:12 +00:00
Jeff Sharkey
b0f9e9d49f am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit '82fee7bd0a82a48e204bcaf5480701b36c857276':
  Only offer migration between private volumes.
 2015-08-14 18:34:36 +00:00
Jeff Sharkey
82fee7bd0a am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
  Only offer migration between private volumes.
 2015-08-14 18:29:15 +00:00
Jeff Sharkey
b4158f0e15 Merge "Only offer migration between private volumes." into mnc-dev 2015-08-14 18:23:39 +00:00
Chris Tate
b184056727 am 95a3e220: am 7c8cb46f: am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '95a3e2200c8e2662999bf2453ca8312d6c5312c0':
  Make "Ask every time" actually work that way
 2015-08-14 17:41:11 +00:00
Chris Tate
7c8cb46fe3 am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '36e2d32dab47f9d46c0234202c2a799c43b67c9e':
  Make "Ask every time" actually work that way
 2015-08-14 17:27:02 +00:00
Chris Tate
36e2d32dab am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '7e36d33c00458a5f74b69963723c6e06f3f6ccf3':
  Make "Ask every time" actually work that way
 2015-08-14 17:20:18 +00:00
Chris Tate
7e36d33c00 Merge "Make "Ask every time" actually work that way" into mnc-dev 2015-08-14 17:11:48 +00:00
Jeff Sharkey
6f52ed3332 Only offer migration between private volumes. 
Without this change, there is a confusing option to migrate a public
SD card volume to internal storage, which will always fail if the
user picks it, since it's not supported under the hood.

Bug: 22966671
Change-Id: Id7cad07eea6583aace398a6d64383bf7d884ae9e
 2015-08-14 09:46:03 -07:00
Adam Lesinski
8f743471d5 BatteryStats: Fix coalescing of shared app GIDs and system UIDs 
UIDs that consumed power and were actually shared app GIDs are now
coelsced for system apps as well as regular applications. In addition,
system UIDs like logd, NFC, DRM, etc are coalesced into Android System.

Bug:23189342
Change-Id: I6c8eb4baec66fba3d1f71a155d8ea1fe920ffec9
 2015-08-13 22:12:47 -07:00
Jeff Sharkey
6dcc2004ad am ffe642ed: am fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev 
* commit 'ffe642ed030277d2e065b6ad55596c35b1daff39':
  Show storage slow dialog allowing state loss.
 2015-08-14 03:18:55 +00:00
Jeff Sharkey
fa62043590 am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev 
* commit 'c73287b9dbfe63ddde24ac1e0975f50382f24e71':
  Show storage slow dialog allowing state loss.
 2015-08-14 01:31:27 +00:00
Jeff Sharkey
c73287b9db am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev 
* commit 'ae531f1f613fb1a94fade18e5e92fc842a2a9016':
  Show storage slow dialog allowing state loss.
 2015-08-14 01:24:41 +00:00
Jeff Sharkey
ae531f1f61 Merge "Show storage slow dialog allowing state loss." into mnc-dev 2015-08-14 01:18:18 +00:00