PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,094 Commits 1 Branch 0 Tags
72b9fbf0a1af103b38d98a8bd9bca8ab2270e033
Commit Graph

27094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
72b9fbf0a1 Merge "Fix sim status screen" into nyc-dev am: e9dffcd am: 18bf2fb 
am: bdbf6e771a

* commit 'bdbf6e771a773a228787adaf1264655538b937b5':
  Fix sim status screen

Change-Id: Ia0a1eb92232845492be5fc25e89e7257aeaab4aa
 2016-04-21 03:26:35 +00:00
Jason Monk
9b8d070f42 Merge "Fix storage title clearing in multi-window" into nyc-dev am: 0bea8a9 am: 018d99c 
am: 6d2afc0cc3

* commit '6d2afc0cc3f7e6cf5936cef69a5eb88e2503d2bf':
  Fix storage title clearing in multi-window

Change-Id: I27502e83f1fc2d5adf5a165bf398d7b35031773f
 2016-04-21 03:26:30 +00:00
Andrew Sapperstein
ffced3af7f Remove ToastController. am: 1d1a269 
am: 3c05137c23  -s ours

* commit '3c05137c23bd2ebb61c7e9cd933b7d89d70f8905':
  Remove ToastController.

Change-Id: Ib835fb1f802ac67e40850c14b929d0846be2cf99
 2016-04-21 03:25:56 +00:00
Andrew Sapperstein
2524686c66 resolve merge conflicts of b0c58aa to master 
Change-Id: Icc3af5956eb53de76c0384dccd662c6019c0958b
 2016-04-20 17:56:12 -07:00
Jason Monk
bdbf6e771a Merge "Fix sim status screen" into nyc-dev am: e9dffcd 
am: 18bf2fb

* commit '18bf2fbdac097ab078cd3c2b726cc9fc971c9dd9':
  Fix sim status screen

Change-Id: I9b33ff21135b1d39938a6cbf34e013045629b429
 2016-04-20 21:44:05 +00:00
Jason Monk
6d2afc0cc3 Merge "Fix storage title clearing in multi-window" into nyc-dev am: 0bea8a9 
am: 018d99c

* commit '018d99cd288622bc4daf37b969e3340441bcb28d':
  Fix storage title clearing in multi-window

Change-Id: I0e1f19ca14989df82c65adbb0612dcc97370f27b
 2016-04-20 21:44:02 +00:00
Andrew Sapperstein
3c05137c23 Remove ToastController. 
am: 1d1a269

* commit '1d1a2694e93f5b9d8c6fe01a3be8737ae0034736':
  Remove ToastController.

Change-Id: I933a0091c6a16115ea112eb13f2c19592d2c0d6c
 2016-04-20 21:44:01 +00:00
Andrew Sapperstein
b0c58aa530 Merge "Create feature factory interface & initial impl." into nyc-mr1-dev 
am: 12344c5

* commit '12344c5ff5be19e9f610df033b2cdf529cd13d76':
  Create feature factory interface & initial impl.

Change-Id: I0e4cb8ae5c4ac749b38da306d870be01c1775958
 2016-04-20 21:43:58 +00:00
Jason Monk
18bf2fbdac Merge "Fix sim status screen" into nyc-dev 
am: e9dffcd

* commit 'e9dffcd34df3b1919f3843e0c0013fb793699e3f':
  Fix sim status screen

Change-Id: Iba80d84350dbff891e3069b04e5f585b10f50491
 2016-04-20 17:32:39 +00:00
Jason Monk
e9dffcd34d Merge "Fix sim status screen" into nyc-dev 2016-04-20 17:24:24 +00:00
Jason Monk
13d1c384e8 Fix sim status screen 
Change-Id: Id7a98b642b006beb8dc6999176184b5d90f6b22f
Fixes: 27963774
 2016-04-20 13:22:36 -04:00
Jason Monk
018d99cd28 Merge "Fix storage title clearing in multi-window" into nyc-dev 
am: 0bea8a9

* commit '0bea8a9f48eabefbd41484ffa19ec21637150a2c':
  Fix storage title clearing in multi-window

Change-Id: Ic0063a2c0c4b705001ec9de42dc9054794e0d6f4
 2016-04-20 17:19:11 +00:00
Jason Monk
0bea8a9f48 Merge "Fix storage title clearing in multi-window" into nyc-dev 2016-04-20 17:08:29 +00:00
Jason Monk
f3446f98d5 Fix storage title clearing in multi-window 
By accurately tracking detached state.

Change-Id: If9d60000f7737c834afde680d15a2af21f7e3165
Fixes: 27989238
 2016-04-20 13:05:45 -04:00
Andrew Sapperstein
1d1a2694e9 Remove ToastController. 
Wasn't meant to be submitted.

Change-Id: Icc94daaf47ed85cefb59f20928241ef38d5ee2ca
(cherry picked from commit 17047d1939)
 2016-04-20 16:54:13 +00:00
Andrew Sapperstein
12344c5ff5 Merge "Create feature factory interface & initial impl." into nyc-mr1-dev 2016-04-20 16:53:02 +00:00
Jason Monk
1e3cc4a35d Merge "Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 am: 3f53bdb" into nyc-mr1-dev-plus-aosp 
am: b876efe

* commit 'b876efea975ffbedde0d75dc5444c047a6ce4c25':

Change-Id: Ia8b64753192505f1062a3246a6c3c880b1a77e39
 2016-04-20 14:08:21 +00:00
Jason Monk
9cc4a117ef Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 am: 523f522 
am: 9bb25af

* commit '9bb25af64652c40de3a96b993810f61f6b5b6697':
  Potential fix for receiver leak problem

Change-Id: I1f0ef0c093637e9b954e52138198e558223a83d5
 2016-04-20 14:08:20 +00:00
Android Build Merger (Role)
b876efea97 Merge "Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 am: 3f53bdb" into nyc-mr1-dev-plus-aosp 2016-04-20 14:02:25 +00:00
Jason Monk
9bb25af646 Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 
am: 523f522

* commit '523f5228d44cb0a5670fe085bb13ed4217e4e027':
  Potential fix for receiver leak problem

Change-Id: If393c4b4d814aab5f1eb4e0b08c2e5ac1b88bba1
 2016-04-20 14:02:16 +00:00
Jason Monk
304235ea7d Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 
am: 3f53bdb

* commit '3f53bdb8a32f6da6c77ce4ceae7c4b19cf095ef2':
  Potential fix for receiver leak problem

Change-Id: I462601739977f6c3d50d0460df4bb82daeeae865
 2016-04-20 14:02:15 +00:00
Jason Monk
3f53bdb8a3 Merge "Potential fix for receiver leak problem" into nyc-dev 
am: 623a289

* commit '623a289b9a6563afd4c54e1efdb505a5468731ea':
  Potential fix for receiver leak problem

Change-Id: I7cffbfd8a425af397dab9fa4900aab613520c4b5
 2016-04-20 13:59:42 +00:00
Jason Monk
523f5228d4 Merge "Potential fix for receiver leak problem" into nyc-dev 
am: 623a289

* commit '623a289b9a6563afd4c54e1efdb505a5468731ea':
  Potential fix for receiver leak problem

Change-Id: Id8f248da03867074561ce3c34cff80ffcb84ad93
 2016-04-20 13:59:15 +00:00
Jason Monk
623a289b9a Merge "Potential fix for receiver leak problem" into nyc-dev 2016-04-20 13:49:32 +00:00
Clara Bayarri
36f6c6cb19 Merge "Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc am: 6a782d9" into nyc-mr1-dev-plus-aosp 
am: b396a08

* commit 'b396a0897e0f55de254e12179d75c38ea53fb896':

Change-Id: I095c7133f26e03eac670689f2833f9b2625924ca
 2016-04-20 13:37:23 +00:00
Clara Bayarri
bfb48f099a Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc am: 38ee923 
am: 83ff72c

* commit '83ff72cd44cd5b8638e002e784f7c5b96b379e2b':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: Ibe735f3be61cc1b6ceb8a30e9060dc3d8dc9eefc
 2016-04-20 13:37:23 +00:00
Android Build Merger (Role)
b396a0897e Merge "Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc am: 6a782d9" into nyc-mr1-dev-plus-aosp 2016-04-20 13:34:13 +00:00
Clara Bayarri
d67f9a41fb Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc 
am: 6a782d9

* commit '6a782d925f456209de47569fd7308e43a94a7f94':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: I5840c18389d1dbcd6bb2a8121ddf4ad3302548fc
 2016-04-20 13:34:03 +00:00
Clara Bayarri
83ff72cd44 Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc 
am: 38ee923

* commit '38ee923a5e97e87e5e1135ac3b8d588d90e0c446':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: I519a294015346595bf20d35ab35fb5c5663e58d6
 2016-04-20 13:34:02 +00:00
Clara Bayarri
38ee923a5e Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev 
am: 81c03dc

* commit '81c03dc32f723f1489c48640eb27fb40c0b47f0c':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: I75dcdc1f242a99abdbeb96460dcbda5787f22b63
 2016-04-20 13:30:46 +00:00
Clara Bayarri
6a782d925f Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev 
am: 81c03dc

* commit '81c03dc32f723f1489c48640eb27fb40c0b47f0c':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: I336ea364687f696ea90c3261c843447175f00d26
 2016-04-20 13:30:45 +00:00
Clara Bayarri
81c03dc32f Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev 2016-04-20 13:24:43 +00:00
Clara Bayarri
cd6a2115c6 Fix Developer options appears after first boot, disappers on Settings Menu Reload 
The Tiles are updated to disabled via PackageManager, which takes a few
seconds to kick in and hence the user sees the option appear and then
disappear. Making Developer Options disabled by default fixes the flash.

Note now the opposite happens, on eng builds where Developer Settings
are on by default they will not appear until the PackageManager update
has cleared.

Bug: 28121698
Change-Id: Ic7147e4430e2332d596ce37dbbce30e330dcf551
 2016-04-20 11:51:52 +01:00
Daichi Hirono
4878073ed6 Merge "Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7 am: 4362396184" into nyc-mr1-dev-plus-aosp 
am: 5fafee9819

* commit '5fafee981993da295aecc34a9601c6a59ca41af2':

Change-Id: Ic12f33600b6c106049963b7e0c1f64ba747b734a
 2016-04-20 00:16:30 +00:00
Daichi Hirono
9b182e8c2b Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7 am: ef5285e3f6 
am: 1a7aa2654f

* commit '1a7aa2654fba1368aa28074e667f7d4460bd3da5':
  Add nullcheck to StorageSettings.

Change-Id: Ied5f853f7e86aa9b7298ad9ef6c01410a2d0f217
 2016-04-20 00:16:29 +00:00
Android Build Merger (Role)
5fafee9819 Merge "Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7 am: 4362396184" into nyc-mr1-dev-plus-aosp 2016-04-20 00:14:19 +00:00
Daichi Hirono
f3d0b4af2f Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7 
am: 4362396184

* commit '4362396184d0da37ad5d955f37dead01f6df5455':
  Add nullcheck to StorageSettings.

Change-Id: If0bac078c1d147c7d966fab8610e6a9fa629a0ae
 2016-04-20 00:14:13 +00:00
Daichi Hirono
1a7aa2654f Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7 
am: ef5285e3f6

* commit 'ef5285e3f6b83cbb32af1cda334a56477b7cdf3d':
  Add nullcheck to StorageSettings.

Change-Id: Ib04ec248edcb5e46ac90c2cbb5c6662b7d5d3b47
 2016-04-20 00:14:11 +00:00
Daichi Hirono
ef5285e3f6 Merge "Add nullcheck to StorageSettings." into nyc-dev 
am: 0e048a11c7

* commit '0e048a11c7a9567cf77fbef481a564833359369f':
  Add nullcheck to StorageSettings.

Change-Id: I58982903534d2dce24bd453bc72617a607373684
 2016-04-20 00:12:03 +00:00
Daichi Hirono
4362396184 Merge "Add nullcheck to StorageSettings." into nyc-dev 
am: 0e048a11c7

* commit '0e048a11c7a9567cf77fbef481a564833359369f':
  Add nullcheck to StorageSettings.

Change-Id: I749ecbe1ae8ce687ae9feca98a75539405b0a579
 2016-04-20 00:12:03 +00:00
Daichi Hirono
0e048a11c7 Merge "Add nullcheck to StorageSettings." into nyc-dev 2016-04-20 00:04:11 +00:00
Amit Mahajan
fe25483a6b resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp am: d2477357e8 
am: 198b92d037

* commit '198b92d0374982030d694ee1f941a3ee98714606':
  Fix APN cannot save after ApnEditor is paused.

Change-Id: I34f602abab2f3e2e63124e642ee65675de061a4d
 2016-04-19 23:28:47 +00:00
yifan.bai
198b92d037 resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp 
am: d2477357e8

* commit 'd2477357e86f453b8aef9e4255edf55625c5cd3d':
  Fix APN cannot save after ApnEditor is paused.

Change-Id: Ieb25454381616d68458e8416ffe933b77dcec9fd
 2016-04-19 23:26:31 +00:00
Amit Mahajan
d2477357e8 resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp 
Change-Id: I6cf4ec06ee296fa13b51e36379a9bc77edaac1bc
 2016-04-19 16:15:56 -07:00
yifan.bai
5213f71536 Merge "Fix APN cannot save after ApnEditor is paused." 
am: 052768a8b5

* commit '052768a8b57cc5dc8ec8ea7bebccbc3f0b1e9c09':
  Fix APN cannot save after ApnEditor is paused.

Change-Id: I2f7ac81f9955ca02ab8b37084bed68934a11f9e9
 2016-04-19 23:06:49 +00:00
Andrew Sapperstein
13792886a7 Create feature factory interface & initial impl. 
Creates the abstract class FeatureFactory and an AOSP implementation
called Factory.

Also creates a static library for generating logtags since we need to use the code generated
by the logtags in multiple packages now.

BUG: 27751878
Change-Id: I88d826333642d3efc252134c4facb7b1ca014f32
(cherry picked from commit 867bb9c07a)
 2016-04-19 23:01:49 +00:00
Amit Mahajan
052768a8b5 Merge "Fix APN cannot save after ApnEditor is paused." 2016-04-19 22:58:18 +00:00
Android Build Merger (Role)
c3eeb35841 Merge "Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511 am: 2620e24 am: 29a04c0" 2016-04-19 21:02:59 +00:00
Android Build Merger (Role)
56bc22b88a Merge "Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511 am: 3d2cba5 am: a1acb6a" 2016-04-19 21:02:57 +00:00
Johan Redestig
e6e3da9b46 Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511 am: 2620e24 
am: 29a04c0

* commit '29a04c05a51fa6751a4138c661d728ae57cde643':

Change-Id: Id4661ac95b189246c3006f619a8c90b3e444ce09
 2016-04-19 21:02:50 +00:00