PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,070 Commits 1 Branch 0 Tags
eb3b52d41147b87dcb46ff04de5486bb96241bdc
Commit Graph

25070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoltan Szatmary-Ban
1a04072c47 am e78d9ab7: (-s ours) am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev 
* commit 'e78d9ab78f379cfa4e9ada05115ffc16621f1d5e':
 2015-08-27 11:31:02 +00:00
Christopher Tate
7cf1e6daa2 am 2db668d5: (-s ours) am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev 
* commit '2db668d547674e787f2c8fef101c7385ad9677a6':
 2015-08-27 11:30:57 +00:00
Amith Yamasani
1160846ac4 am 5ce2a7f5: (-s ours) am 7ac21204: Merge "Use localized name for guest user" into mnc-dev 
* commit '5ce2a7f5c46ddced28400f62f4daa87269fc5ff5':
 2015-08-27 11:30:42 +00:00
Jorim Jaggi
6ea21ffb72 am 09c30740: (-s ours) am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev 
* commit '09c307401893886a7d82baa520f33d6956b56de4':
 2015-08-27 11:30:36 +00:00
Jeff Sharkey
cf82dbec38 am 31d519fe: (-s ours) am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev 
* commit '31d519fe37f6132f01b6193fec91d9f9b5b97908':
 2015-08-27 11:30:29 +00:00
Jeff Sharkey
22bf2806b4 am 139e1964: (-s ours) am 7616b00b: Merge changes from topic \'mig\' into mnc-dev 
* commit '139e19647169a736d1f8b1b71479bd36742a2341':
 2015-08-27 11:30:22 +00:00
Geoff Mendal
19f5403aed am 479b00cd: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE 
* commit '479b00cd40c0173ba3e51f072efa0aa5e432234c':
 2015-08-27 11:30:06 +00:00
Julia Reynolds
8d731a62d4 Merge "Use common extra names when launching external config." 2015-08-26 18:47:08 +00:00
Fyodor Kupolov
9983991ed4 Merge "Renamed primaryUserOnly to systemUserOnly" 2015-08-26 17:25:52 +00:00
Robin Lee
baefdcf9eb Show installed user keys in Security Settings 
This makes removing a particular keyset possible without deleting the
whole keystore along with it.

Bug: 22541933
Change-Id: I248803cb27efdd1695438dfc82951887dc579f99
 2015-08-26 16:22:19 +01:00
Geoff Mendal
23a13d5167 am 6d9b908a: (-s ours) am ebf23a76: (-s ours) am 3b545b41: (-s ours) am fbfdede1: (-s ours) Import translations. DO NOT MERGE 
* commit '6d9b908a31702ff1d6d8ea98ad1817c58fbeaf12':
  Import translations. DO NOT MERGE
 2015-08-26 14:44:04 +00:00
Geoff Mendal
6d9b908a31 am ebf23a76: (-s ours) am 3b545b41: (-s ours) am fbfdede1: (-s ours) Import translations. DO NOT MERGE 
* commit 'ebf23a763f240b203480d53bc29895d14e230f89':
  Import translations. DO NOT MERGE
 2015-08-26 14:33:36 +00: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
Geoff Mendal
5dda1fa870 Import translations. DO NOT MERGE 
Change-Id: Ib5bcf56683aab565a59b874cf85529d4dd2d2fb6
Auto-generated-cl: translation import
 2015-08-26 06:21:28 -07:00
Yasuhiro Matsuda
a5c73b423d Merge "Handle the case where null is returned for USB_STATE intent." 2015-08-26 09:36:41 +00:00
Yasuhiro Matsuda
ea37281d9e Merge "Handle the case where USB_STATE intent is not received yet." 2015-08-26 09:36:41 +00:00
Lifu Tang
b3e11be230 Created new task when launching injected activity 
Bug: 22320782
Change-Id: I6cf1e4976a097c4c40afcc4c73f7f9904e9e7aac
 2015-08-25 18:45:52 -07:00
Fyodor Kupolov
25f1f6086c Renamed primaryUserOnly to systemUserOnly 
Bug: 22958572
Change-Id: Iaea879e76ec24c1b18446addd4d575514c94625b
 2015-08-25 18:22:53 -07: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
Julia Reynolds
3692a5abe1 Use common extra names when launching external config. 
Bug: 22977552
Change-Id: Ib91bcea76598cb5e712ad0c1f0a5cd1f9dc16fbe
 2015-08-25 14:55:54 -04: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
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
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