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

22459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoltan Szatmary-Ban
fde014516f am 30a73372: (-s ours) am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev 
* commit '30a73372c4498b671b728e29ff1b7391e58057c5':
 2015-08-27 11:31:52 +00:00
Geoff Mendal
458a9bfd40 am 88afe4a4: (-s ours) am da15ade8: (-s ours) Import translations. DO NOT MERGE 
* commit '88afe4a4d7e4cb876908c1898f610dabbd5c7202':
 2015-08-27 11:31:51 +00:00
Robin Lee
248f0d640c am 27c45eb9: (-s ours) am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev 
* commit '27c45eb9f24a6fe12ad61199b90bb8fdbd0df4db':
 2015-08-27 11:31:50 +00:00
Rubin Xu
dc87b10523 am 20eb7e10: (-s ours) am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev 
* commit '20eb7e10f27f564cb40ad5f0398fb2e8c17d897a':
 2015-08-27 11:31:48 +00:00
Jason Monk
9f42b59567 am 4484cc4f: (-s ours) am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev 
* commit '4484cc4ff4c1bef78ac52d8abd8351b09a9a1e1b':
 2015-08-27 11:31:46 +00:00
Julia Reynolds
60717d23ec am bc79da2b: (-s ours) am ddd887af: Prevent crash when removing an account. 
* commit 'bc79da2b3e32fe86628e61aedba57d391053a382':
 2015-08-27 11:31:44 +00:00
Julia Reynolds
aa4abafbc2 am 46ea05da: (-s ours) am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev 
* commit '46ea05da72db4719faed1c3ec173448d7a2f0706':
 2015-08-27 11:31:42 +00:00
Jason Monk
36d5e562dd am dee0d05b: (-s ours) am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev 
* commit 'dee0d05b5c6797b860fef9e6591249391956edc3':
 2015-08-27 11:31:39 +00:00
Jason Monk
0baaeec3b8 am 296aec41: (-s ours) am b6b85325: Merge "Fix rotation issues" into mnc-dev 
* commit '296aec4127468ca79c1db60672a2cb0d39e3b0c1':
 2015-08-27 11:31:37 +00:00
Zoltan Szatmary-Ban
d49d03228d am b0afdf2f: (-s ours) am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev 
* commit 'b0afdf2f5ab38b947cee443979d9833bd1af03c2':
 2015-08-27 11:31:34 +00:00
Zoltan Szatmary-Ban
4be3460262 am b0a8c420: (-s ours) am 4bbe3d1f: Update all shown preferences in Settings > Storage 
* commit 'b0a8c4203c859ee26d1989387e0406d0a86da6f5':
 2015-08-27 11:31:32 +00:00
Sasha Levitskiy
544932fc4a am a5251bbc: (-s ours) am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev 
* commit 'a5251bbcffc5e740c278b8d600481e705a1e9277':
 2015-08-27 11:31:30 +00:00
Tim Kilbourn
c2d6851ac5 am ad1aa525: (-s ours) am 49983b99: Show correct text for app link domains. 
* commit 'ad1aa5252fcef6ec6537f0fa9da3e84818a78512':
 2015-08-27 11:31:28 +00:00
Jorim Jaggi
8107a3b1e2 am 221e0f44: (-s ours) am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit '221e0f4400e25ee40bf3428c89b8de5a9415ba9a':
 2015-08-27 11:31:27 +00:00
Jeff Sharkey
4f0205d314 am 6b09d2c9: (-s ours) am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '6b09d2c9825a0936027e509f36ad04ccc12883d5':
 2015-08-27 11:31:25 +00:00
Amit Mahajan
3876ef95ca am 5fc2772b: (-s ours) am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev 
* commit '5fc2772b5d3486f2b7ad48556ff945a0b3e267e5':
 2015-08-27 11:31:23 +00:00
Sanket Padawe
2ea4986406 am 2d633c97: (-s ours) am c7777b94: Merge "Locale based string changes in BT." into mnc-dev 
* commit '2d633c9744a0b2ae7373068cdca752777df439d1':
 2015-08-27 11:31:22 +00:00
Sanket Padawe
0e67389f25 am 88701273: (-s ours) am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev 
* commit '88701273e3056d86fb2f442400de9dec994d669e':
 2015-08-27 11:31:20 +00:00
Robin Lee
6d55794327 am d1e93240: (-s ours) am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev 
* commit 'd1e93240aadca200462de351415abed5e856b58c':
 2015-08-27 11:31:17 +00:00
Geoff Mendal
62b24c74a9 am 74d8ac2e: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '74d8ac2e274f0a19f5164191e8dd00dd8e741428':
 2015-08-27 11:31:14 +00:00
Jason Monk
06bb8569a2 am 49c78619: (-s ours) am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev 
* commit '49c7861984dfe4bf4516a5666995e3b36c0f7fd7':
 2015-08-27 11:31:10 +00:00
Zoltan Szatmary-Ban
dc8fcbabe7 am 909ddcca: (-s ours) am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev 
* commit '909ddcca43803078c838da0c6b9a9c84ddb715a6':
 2015-08-27 11:31:07 +00:00
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
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
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
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
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
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
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