PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,208 Commits 1 Branch 0 Tags
1a1181edde0d8d941161e941f12e6783f25ae43d
Commit Graph

8386 Commits

Author SHA1 Message Date
Lucky Zhang
47811fe057 [FRP] Notification screen slides in wrong direction 
The method that launches notification screen from choose lock activity
finished the original activity before starting the new activity. This
made the system think it is a backward transition instead of a forward
one. Swapping the order to start new activity first and then finish
old activity fixed the problem.

This also changes the behavior in settings. However, it seems like this
is also the desired behavior for settings.

Bug: 18723199
Change-Id: I90538fa52e0d62a2274c8e0333682035849802c6
 2014-12-11 18:10:01 -08:00
Sanket Padawe
75e0082ae8 Exiting activity on clicking outside dialog acitivity. 
Bug: 18705619
Change-Id: I50cb08884f1c97352f5ad3a3e7d218b42af1ada4
 2014-12-11 14:36:26 -08:00
Jason Monk
37832d661a Add a periodic check of the tethering provisioning 
Add a service that handles the check through broadcasts which are
defined through configs, similar to the previous configs for the
activity.

Depends on I1f6e2d954562c5a16a0de60dac625005ec3e5c50

Bug: 18453076
Change-Id: I515d72706e9ca37877e67c44427af1b75b146390
 2014-12-11 15:07:45 -05:00
Wink Saville
d72c062fa8 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId. 
Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
 2014-12-11 10:10:05 -08:00
Zoltan Szatmary-Ban
d2acd90533 am 1162cf30: Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev automerge: 25a1181 automerge: d0831ae 
* commit '1162cf3084c6e077e2a0cafb831fe16a18e0be62':
  Bring up correct app for Recent location list items
 2014-12-11 18:07:36 +00:00
PauloftheWest
2ad430e742 am e391e713: Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev automerge: 209c946 automerge: 13028d1 
* commit 'e391e713cb34648ad6fc9d3f7336c574acc4787c':
  Disabled SIM notifications while provisioning.
 2014-12-11 18:07:34 +00:00
Zoltan Szatmary-Ban
1162cf3084 Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev automerge: 25a1181 
automerge: d0831ae

* commit 'd0831ae2144ce9c2eae2f11be2f4ed3689df2597':
  Bring up correct app for Recent location list items
 2014-12-11 18:02:29 +00:00
PauloftheWest
e391e713cb Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev automerge: 209c946 
automerge: 13028d1

* commit '13028d1d90a995b71999ee7c00f04adabd9cb7ff':
  Disabled SIM notifications while provisioning.
 2014-12-11 18:02:17 +00:00
Zoltan Szatmary-Ban
25a1181f2a Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev 2014-12-11 13:23:30 +00:00
PauloftheWest
209c9465b3 Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev 2014-12-11 13:14:07 +00:00
PauloftheWest
fe3b679090 am 87015c01: am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev 
automerge: 6a8b163

* commit '6a8b1634c053192d2abfdd8f1e0f5df9aecbf216':
  Fixed a Data Usage crash
 2014-12-11 00:11:24 +00:00
PauloftheWest
6a8b1634c0 am 87015c01: am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev 
* commit '87015c0166d84b86fd1067f7e4effbe898b60c7c':
  Fixed a Data Usage crash
 2014-12-11 00:07:03 +00:00
PauloftheWest
5b3da0cc30 Disabled SIM notifications while provisioning. 
Bug: 18672853
Change-Id: I01ba2927ad013649f13b959354a6493ba057e09f
 2014-12-10 15:00:27 -08:00
Alexandra Gherghina
4b9be76b1d am 0d04d8cb: am 32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev 
automerge: a8f7074

* commit 'a8f70740c495f7d3f47db65bb08ccdb58c52b178':
  Fix NPE in Running Processes view in Apps Settings
 2014-12-10 22:28:34 +00:00
Emily Bernier
ff7c75cd17 am b366a286: am 5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev 
automerge: 7a3b253

* commit '7a3b253f086150ab030db967862002795a29bb83':
  Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
 2014-12-10 22:28:17 +00:00
Alexandra Gherghina
a8f70740c4 am 0d04d8cb: am 32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev 
* commit '0d04d8cbe8754e75a429f851d0d5a1b14829688b':
  Fix NPE in Running Processes view in Apps Settings
 2014-12-10 22:23:57 +00:00
Emily Bernier
7a3b253f08 am b366a286: am 5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev 
* commit 'b366a286b869890ebbf59f2400c37c97661fe8fa':
  Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
 2014-12-10 22:23:54 +00:00
Stuart Scott
b3dd601286 Show toast when cellular data option is changing. 
bug: 18594162
Change-Id: I19dc265af47c0a40a6ace6d4bf42e21e035daf0a
 2014-12-10 13:31:36 -08:00
PauloftheWest
ab88ad9381 Merge "Fixed a Data Usage crash" into lmp-mr1-dev 2014-12-10 21:16:10 +00:00
Alexandra Gherghina
32ca6f1fbf Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev 2014-12-10 17:42:42 +00:00
PauloftheWest
f0d84e2e53 Fixed a Data Usage crash 
Bug: 18364933
Change-Id: I80657c6541aec0b4706ef4aa229c9f858776aab2
 2014-12-10 09:38:02 -08:00
Emily Bernier
5a528b274f Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev 2014-12-10 17:25:15 +00:00
Alexandra Gherghina
f43aa811b7 Fix NPE in Running Processes view in Apps Settings 
Bug: 18676587
Change-Id: Ib4b400241f0ebd6dd4aacad4bfdda6dfb75cdfb5
 2014-12-10 10:24:31 +00:00
Maurice Lam
acb6229507 am 0fde6bb9: Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev automerge: e0f637a 
automerge: 4eaf999

* commit '4eaf999a540d31e1caacd5edf29b7e6ab75f6c11':
  [FRP] Shrink lock screen when keyboard pops up
 2014-12-10 03:39:03 +00:00
Maurice Lam
4eaf999a54 am 0fde6bb9: Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev automerge: e0f637a 
* commit '0fde6bb98a6e22088a53560f60b17cc824b8098f':
  [FRP] Shrink lock screen when keyboard pops up
 2014-12-10 03:34:02 +00:00
Maurice Lam
e0f637a66b Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev 2014-12-10 01:17:15 +00:00
Emily Bernier
50ac12e222 Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity 
In some cases, NETWORK_STATE_CHANGED_ACTION broadcasts are sent before
the current network state has been updated in ConnectivityService. Listening
for CONNECTIVITY_ACTION broadcasts as well ensures that we properly catch
new connections and auto-advance appropriately.

Bug: 18503725
Change-Id: Ia414d57d196d09171342fb3ae93c7e826cb1a1aa
 2014-12-09 20:02:41 -05:00
PauloftheWest
06954be683 am aa800609: Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev automerge: 58a73bb 
automerge: 01c6a56

* commit '01c6a56c1623a4858d1a28ada0fdc0d7f87b935e':
  Added Multi-SIM capability to Access Point Names
 2014-12-09 23:22:46 +00:00
PauloftheWest
510f4b4d69 am e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev automerge: bfb8449 
automerge: 05275af

* commit '05275aff0ad8fd1b90786fa62ed0372ed4d86035':
  Fixed a SIM Lock UI issue
 2014-12-09 23:22:36 +00:00
PauloftheWest
01c6a56c16 am aa800609: Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev 
automerge: 58a73bb

* commit '58a73bbc0a6df6157531dc94cc305cd3a9922041':
  Added Multi-SIM capability to Access Point Names
 2014-12-09 23:22:10 +00:00
PauloftheWest
05275aff0a am e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev 
automerge: bfb8449

* commit 'bfb8449aea4d6ac7e4b6c21e28faa49344f93806':
  Fixed a SIM Lock UI issue
 2014-12-09 23:20:25 +00:00
Wink Saville
fff0617959 am f8c4fe2d: am 85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev 
automerge: da77fcf

* commit 'da77fcf428dc70826fe4a8789193660563a831f3':
  Add debug dataEnable.
 2014-12-09 23:17:15 +00:00
Prem Kumar
c63471753f am 35b3257e: am 1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 
automerge: 5c8dff3

* commit '5c8dff3e92105dfa861cb2fb1bde8b57fea6e381':
  Fixed a SIM Cards crash.
 2014-12-09 23:17:07 +00:00
John Spurlock
d876825c0f am 8aa3e663: am 1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev 
automerge: 195b9c8

* commit '195b9c855ad107b8205fef37dd187a1df7695230':
  Settings: Rebind to volume sliders after returning from stopped.
 2014-12-09 23:16:56 +00:00
Jeff Sharkey
8a5762d684 am e0d9f74d: am 14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 
automerge: e5c7bae

* commit 'e5c7baec2b6b26811531fa6622711ca970e5ca77':
  Offer to "merge" subscribers for data usage.
 2014-12-09 23:16:47 +00:00
PauloftheWest
900bdb3388 am 5acd934b: am 2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev 
automerge: d54211c

* commit 'd54211c76de5cd0c7e45effbdb2bfdf0081fc94c':
  SIM cards in Setting will only show on Multi-SIM devices
 2014-12-09 23:16:39 +00:00
PauloftheWest
6c85187a5d am 743e8259: am a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev 
automerge: 6f55eb7

* commit '6f55eb72f4a0ec55c0c635f36d678a105706c1fd':
  Fixed a SimSettings issue
 2014-12-09 23:16:30 +00:00
John Spurlock
f7f6aaeff7 am 65802e5a: am f68bc645: Settings: Hide downtime settings if not supported. 
automerge: d888715

* commit 'd88871564f3df3325f6a683d8f2baad5b043b1d6':
  Settings: Hide downtime settings if not supported.
 2014-12-09 23:16:22 +00:00
Zoltan Szatmary-Ban
77d7e17fba am 5d653fe8: am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 
automerge: 45f0423

* commit '45f04233c22231d3216ceb9a1a7cc5b09cf45401':
  Make Location Settings multiprofile aware
 2014-12-09 23:15:46 +00:00
Lucky Zhang
64192c36fa am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev 
automerge: a4df967

* commit 'a4df9673896bf7fb317b8ae92246b555d712a79d':
  [FRP] Remove None and Swipe from screen lock options
 2014-12-09 23:15:29 +00:00
Jeff Davidson
06b65d1c7d resolve merge conflicts of 0c7e4ed to master. 
Change-Id: I6c5625564f69769eb6f61d3df7531f032080d0d9
 2014-12-09 15:11:44 -08:00
PauloftheWest
aa80060930 Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev 2014-12-09 23:10:36 +00:00
PauloftheWest
e6d7b31fc4 Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev 2014-12-09 23:04:19 +00:00
Zoltan Szatmary-Ban
d80e1278b0 Bring up correct app for Recent location list items 
When clicking on a list item in Settings > Location > Recent locations,
the correct app should be shown for items corresponding to managed
profile apps.

Bug: 17655978
Change-Id: Ie4b388f0ea103ee16629b0d8d92e5de08adffc5e
 2014-12-09 19:20:21 +00:00
Wink Saville
da77fcf428 am f8c4fe2d: am 85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev 
* commit 'f8c4fe2d3c0281243fd246c00c1d460e891b386e':
  Add debug dataEnable.
 2014-12-09 18:05:56 +00:00
Wink Saville
85d3b0fa6e Merge "Add debug dataEnable." into lmp-mr1-dev 2014-12-09 17:52:20 +00:00
Prem Kumar
5c8dff3e92 am 35b3257e: am 1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 
* commit '35b3257e078ea2609a2e5ef28019b92349f6b41b':
  Fixed a SIM Cards crash.
 2014-12-09 11:29:22 +00:00
Maurice Lam
a49c7c572f [FRP] Shrink lock screen when keyboard pops up 
Because setup wizard uses immersive mode, the default adjustResize
flag doesn't work; so we need to respond to window insets manually.

Bug: 18651680
Change-Id: I9e53d3455c41404cca8a347b49b559200353b7ac
 2014-12-08 18:43:11 -08:00
Prem Kumar
1e1251cc04 Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 2014-12-09 02:25:15 +00:00
Maurice Lam
2a321adc9b am 2dded568: am 53bfcb52: am 7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev 
* commit '2dded568fe0afbc18dda0a5abd0afa6911558dee':
  [FRP] Use Lock type as header instead of "Encryption"
 2014-12-09 00:55:49 +00:00