PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,979 Commits 1 Branch 0 Tags
e8a45fce5a78daa56231bdf460b10bc8b700cbdc
Commit Graph

67979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Aliomer
2f9e6f6ba3 Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 
Change-Id: I1b5f3194e8a9df86aacc359322792c0e0561f9b2
 2020-05-28 23:37:07 +00:00
TreeHugger Robot
3304eb3fb6 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-28 22:52:24 +00:00
Jay Aliomer
fb6711ae92 Merge "Incorrect localization of dark theme custom time" into rvc-dev 2020-05-28 22:21:21 +00:00
TreeHugger Robot
e5358d39d7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours am: 4bd0678f8d -s ours 
am skip reason: subject contains skip directive

Change-Id: Ifff040da521b8b0a5a0eb86b2fd427783514f5ae
 2020-05-28 20:42:40 +00:00
TreeHugger Robot
13d2ad4f12 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours am: ccb6c24c76 -s ours 
am skip reason: subject contains skip directive

Change-Id: If88543b1f31a0762c83d320a9c835fde144c3383
 2020-05-28 20:42:28 +00:00
TreeHugger Robot
c18e67ab2a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: d33f82d74d -s ours am: 7b20181315 -s ours 
am skip reason: subject contains skip directive

Change-Id: I2381414dd4ce40b2cbdd61494ed858e7154ff8a5
 2020-05-28 20:42:18 +00:00
TreeHugger Robot
ccb6c24c76 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours 
am skip reason: subject contains skip directive

Change-Id: I610e1391362a307dfba04724aba4c87ad4688f76
 2020-05-28 20:25:40 +00:00
TreeHugger Robot
4bd0678f8d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours 
am skip reason: subject contains skip directive

Change-Id: I0e9923c6059bb8d6a6b7b2f04c357d2ca74dcbe8
 2020-05-28 20:25:29 +00:00
TreeHugger Robot
7b20181315 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: d33f82d74d -s ours 
am skip reason: subject contains skip directive

Change-Id: Ibbec16d34d5cc96164b9de16b43270566fe347f5
 2020-05-28 20:25:17 +00:00
TreeHugger Robot
d33f82d74d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours 
am skip reason: subject contains skip directive

Change-Id: I3a54ebb46410c308d3a4bb0fbc34a328157fb8e9
 2020-05-28 20:09:52 +00:00
TreeHugger Robot
171694b82e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours 
am skip reason: subject contains skip directive

Change-Id: Iea9d42d6ce8c804b8cff63ef81ec9bca49aab7ad
 2020-05-28 20:09:41 +00:00
TreeHugger Robot
be2190fe64 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-28 19:58:59 +00:00
Bill Yi
049aca9d5e Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I5f6b84e0c2aef2d2c258f6c8dc80a140c04b1153
 2020-05-28 19:17:11 +00:00
Bill Yi
18428dce24 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I09d9add17cf33cbe0525e728f4e7a3c19a7aa9f2
 2020-05-28 18:38:28 +00:00
Automerger Merge Worker
d2e4b4e292 Merge "Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: a8ebfe9e00 am: 6129b0eb34" into rvc-qpr-dev-plus-aosp 2020-05-28 16:14:03 +00:00
Automerger Merge Worker
d7296747bf Merge "Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 am: 85f4ab8a57" into rvc-qpr-dev-plus-aosp 2020-05-28 16:13:58 +00:00
TreeHugger Robot
a59379e943 Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: a8ebfe9e00 am: 6129b0eb34 
Change-Id: I343ac676905f3af9bbdf56774f2db02a0d63aa48
 2020-05-28 16:13:57 +00:00
Automerger Merge Worker
2d256d5ca8 Merge "Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 am: 691e31b0cf" into rvc-qpr-dev-plus-aosp 2020-05-28 16:13:55 +00:00
TreeHugger Robot
7f82f68d09 Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 am: 85f4ab8a57 
Change-Id: I1cc8afa726ee4e0e19cdedef09af6b3fdd6211bd
 2020-05-28 16:13:53 +00:00
Automerger Merge Worker
5416f137d5 Merge "Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 1d1e16a09b am: a498b95ddb" into rvc-qpr-dev-plus-aosp 2020-05-28 16:13:51 +00:00
TreeHugger Robot
6dda236172 Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 am: 691e31b0cf 
Change-Id: Id5649b46d15c0888686e0364ec140306d05efded
 2020-05-28 16:13:50 +00:00
TreeHugger Robot
96d7595eb9 Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 1d1e16a09b am: a498b95ddb 
Change-Id: I094ccb42ecda4be06a5de18390c3f9adde9f88b7
 2020-05-28 16:13:47 +00:00
Automerger Merge Worker
0b68f1f04b Merge "Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 7a89d57820" into rvc-d1-dev-plus-aosp am: 22a8cba196 
Change-Id: I026e76177c81ae058f9f7c1907d95dd91a3010c2
 2020-05-28 16:13:43 +00:00
TreeHugger Robot
b6de518b1c Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 1d1e16a09b am: 7a71c443d3 
Change-Id: I1125adc186c88de153a517736195f4bc98c37bbc
 2020-05-28 16:13:11 +00:00
paulhu
a788a3190c Forward the ResultReceiver to Tethering Entitlement app 
Bug: 156336264
Test: atest TetherProvisioningActivityTest
Change-Id: I37fcaddd5569223146ff9d6316d97f33312d8d24
Merged-In: I37fcaddd5569223146ff9d6316d97f33312d8d24
 2020-05-29 00:06:52 +08:00
TreeHugger Robot
6129b0eb34 Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: a8ebfe9e00 
Change-Id: I98a080e00085cde55c5ef3a7b9bbc865f3db0181
 2020-05-28 16:01:06 +00:00
TreeHugger Robot
691e31b0cf Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 
Change-Id: I4d39f1d1b7ad6d0ced731f93b3ac9d39e0209f5b
 2020-05-28 16:00:55 +00:00
TreeHugger Robot
85f4ab8a57 Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 
Change-Id: I449df78c934041c4bfc9e242d29b45b53436ce90
 2020-05-28 16:00:51 +00:00
Automerger Merge Worker
22a8cba196 Merge "Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 7a89d57820" into rvc-d1-dev-plus-aosp 2020-05-28 16:00:49 +00:00
TreeHugger Robot
704823b2d4 Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 7a89d57820 
Change-Id: I3165cb7a5851841685370af19694e41f2a2243b8
 2020-05-28 16:00:45 +00:00
TreeHugger Robot
a498b95ddb Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 1d1e16a09b 
Change-Id: I953515152c0e9d7a7bf3bc726a83d29e21841f5b
 2020-05-28 16:00:44 +00:00
TreeHugger Robot
7a71c443d3 Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 1d1e16a09b 
Change-Id: I05739c26296ff53f1c218e0dd0070e10f641e960
 2020-05-28 16:00:38 +00:00
Jay Aliomer
57cc7d01ae Incorrect localization of dark theme custom time 
Fixes: 154361883
Test: manually select dark theme custom time and make sure it matches
locale

Change-Id: I2a918b4b2f5aad6b04d3b0318bbca25e82dfae78
 2020-05-28 12:00:17 -04:00
TreeHugger Robot
a8ebfe9e00 Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 
Change-Id: I153a235418d5089dff46d1f3cbc8b9e0989a2046
 2020-05-28 15:48:18 +00:00
TreeHugger Robot
1438ab4d59 Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 
Change-Id: I6fca5b77f9301f2ddf0336beb8f12dd8bfd9bcb6
 2020-05-28 15:48:00 +00:00
TreeHugger Robot
7a89d57820 Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 
Change-Id: I5f379ae4e52fcdbdeef33f995a4f7179846ca936
 2020-05-28 15:47:52 +00:00
TreeHugger Robot
1d1e16a09b Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 
Change-Id: I50b31cbe7f309b988d30d5cab191dc6be9095eef
 2020-05-28 15:47:30 +00:00
TreeHugger Robot
591d761d43 Merge "Revert "Do not prebind sticky slices."" into rvc-dev 2020-05-28 15:42:28 +00:00
Yi-Ling Chuang
740db33c5c Revert "Do not prebind sticky slices." 
This reverts commit ac59ea8e23.

Reason for revert: Fix it using another approach in ag/11629780. The prebind part will be helpful to cache slice data.

Bug: 152365480
Change-Id: Iebed42027552a923907647b61480f135ac4f4097
 2020-05-28 15:42:15 +00:00
TreeHugger Robot
c3b262ed52 Merge "Increase the timeout for contextual card loading." into rvc-dev 2020-05-28 15:37:37 +00:00
Bonian Chen
d8a4346764 Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d am: 06312e5db5 
Change-Id: Ie4ee52bbf8a2b53ce70779f7bc8d23476ee3e20c
 2020-05-28 15:29:39 +00:00
Bonian Chen
914ba05d04 Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: 42ba4a5fc7 am: fd2b4d8c32 
Change-Id: Id18f9c6462c5d500e933a48e6f22b0cc5bf7f3c5
 2020-05-28 15:29:31 +00:00
Bonian Chen
f2bb69f354 Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d am: 8367dc4e03 
Change-Id: I2bf3f6f320168dc1031299e084dbf79507a5a4f0
 2020-05-28 15:29:17 +00:00
Bonian Chen
fd2b4d8c32 Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: 42ba4a5fc7 
Change-Id: I83ddb21ebd72872ecd23f5fd5c13b691a8529c96
 2020-05-28 15:18:32 +00:00
Bonian Chen
8367dc4e03 Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d 
Change-Id: I42f4408e3030de899931be97cf9561797ccab725
 2020-05-28 15:18:14 +00:00
Bonian Chen
06312e5db5 Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d 
Change-Id: I86f0150ef7eb6f8f4666f749897f47ffff5333cf
 2020-05-28 15:18:10 +00:00
Bonian Chen
cb1353756d Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a 
Change-Id: I98bea7d8fa90e267a3039012bf19babd2eec7223
 2020-05-28 15:07:52 +00:00
Bonian Chen
42ba4a5fc7 Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a 
Change-Id: I7ba14ae944d40e74038c3bdf8dd0a6cf44e5326b
 2020-05-28 15:07:46 +00:00
Bonian Chen
e2da25108a Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev 2020-05-28 14:59:47 +00:00
Automerger Merge Worker
35db8bade4 Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: 6425a5e7c9" into rvc-d1-dev-plus-aosp am: 666b90393f 
Change-Id: I0e9efd8725ea8df11e63880602e04c086fb80831
 2020-05-28 14:58:15 +00:00