PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,351 Commits 1 Branch 0 Tags
bc614dfcb59a8a58dbb20e54535e58aba69bd27c
Commit Graph

19351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
735e93e52c am c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev 
* commit 'c6f5c924d8a796da1a3c2e6bd5e44c755a532771':
  Fixed then icons of SIMs in the call dialog.
 2014-12-16 00:54:20 +00:00
PauloftheWest
4fe583d4cf Merge "Made the WPS icon visisble." into lmp-mr1-dev 2014-12-15 22:49:24 +00:00
Wink Saville
0bf96d604f am 6ac0cef0: am 870a2a8e: am e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev 
* commit '6ac0cef01b655de3665e8750566fa10dac0e5697':
  Use getLIn1NumberForSubscriber to get phone number.
 2014-12-15 22:47:01 +00:00
Stuart Scott
997a734faa am e84524ef: am 56db3f35: am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 
* commit 'e84524efc86517766797fd1614093c08dcb60b2c':
  Show toast when cellular data option is changing.
 2014-12-15 22:47:00 +00:00
PauloftheWest
c6f5c924d8 Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev 2014-12-15 22:46:58 +00:00
Wink Saville
6ac0cef01b am 870a2a8e: am e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev 
* commit '870a2a8ea85670dafdcd9d8617e0c99862f0604d':
  Use getLIn1NumberForSubscriber to get phone number.
 2014-12-15 22:41:53 +00:00
Stuart Scott
e84524efc8 am 56db3f35: am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 
* commit '56db3f35eba2dae6463ac981822d8fe80fc6d189':
  Show toast when cellular data option is changing.
 2014-12-15 22:41:52 +00:00
Wink Saville
870a2a8ea8 am e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev 
* commit 'e04fd76f1c1a345a47673d460a04372670bad6c0':
  Use getLIn1NumberForSubscriber to get phone number.
 2014-12-15 22:35:58 +00:00
Stuart Scott
56db3f35eb am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 
* commit 'b62bfe715552fb86330958755f0e12ab0ffe7cad':
  Show toast when cellular data option is changing.
 2014-12-15 22:35:57 +00:00
PauloftheWest
7d46a4c9fe am d9396835: am 29db97d1: am 682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev 
* commit 'd9396835770cbfa25c28a04e0f0bdcdf91d78a33':
  IMEI information will show without a SIM.
 2014-12-15 22:22:19 +00:00
Maurice Lam
6efd692ffd am befc1267: am 4e8a7219: am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev 
* commit 'befc1267a59b4b412b86babedaa4f6727fa239a0':
  [FRP] Open the lock setup screens in same task
 2014-12-15 22:03:39 +00:00
PauloftheWest
d939683577 am 29db97d1: am 682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev 
* commit '29db97d1189a885324d950ecb3a2e80d1eabaece':
  IMEI information will show without a SIM.
 2014-12-15 21:45:37 +00:00
Sanket Padawe
9b566a0924 Prevent sim notify popup after upgrade from k to LMR1. 
Bug: 18705619
Change-Id: I6de4d20172c69358c1853e6a00c68fc353c7dad7
 2014-12-15 13:26:27 -08:00
Wink Saville
e04fd76f1c Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev 2014-12-15 20:45:00 +00:00
Wink Saville
c47f8db374 Use getLIn1NumberForSubscriber to get phone number. 
Bug: 18721557
Change-Id: I255627638efe21362315286a659ac59b46e1fa30
Signed-off-by: Wink Saville <wink@google.com>
 2014-12-15 12:04:29 -08:00
Stuart Scott
b62bfe7155 Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 2014-12-15 19:43:19 +00:00
PauloftheWest
29db97d118 am 682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev 
* commit '682b7ed34c01ea65edfe034afe52180052b9e2fc':
  IMEI information will show without a SIM.
 2014-12-15 19:34:31 +00:00
PauloftheWest
682b7ed34c Merge "IMEI information will show without a SIM." into lmp-mr1-dev 2014-12-15 19:28:48 +00:00
Narayan Kamath
13df2564af am 62d35b65: resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp 
* commit '62d35b65f236e494520d7ca480e502c79f5f4fe3':
  Stop using apache-http in settings.
 2014-12-15 19:02:26 +00:00
Geoff Mendal
1c09672629 am 755005bd: (-s ours) am d9df577d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '755005bddf4e476dda9404d0ab3ee007b7ebd554':
  Import translations. DO NOT MERGE
 2014-12-15 19:02:09 +00:00
Geoff Mendal
f693ff9efa am 43826e66: (-s ours) am d33d2127: (-s ours) am d3affe47: (-s ours) Import translations. DO NOT MERGE 
* commit '43826e669679b7463cf715a7003e5641f7d24e78':
  Import translations. DO NOT MERGE
 2014-12-15 19:02:00 +00:00
PauloftheWest
592545bf7d Made the WPS icon visisble. 
Bug: 18335660
Change-Id: I62fd0be70680f74d7898dcf806ebbe41e5eb7342
 2014-12-15 10:55:28 -08:00
Lucky Zhang
e421f609eb am a6f6e5a3: am 03f336d0: am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 
* commit 'a6f6e5a35be333921f47d768d053054280552fa5':
  [FRP] Notification screen slides in wrong direction
 2014-12-15 18:46:24 +00:00
PauloftheWest
c8bcf2985a IMEI information will show without a SIM. 
Bug: 18701340
Change-Id: I1e92bd1af4d68849f194d30b5b894cfb144900e5
 2014-12-15 10:29:54 -08:00
Maurice Lam
befc1267a5 am 4e8a7219: am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev 
* commit '4e8a7219c866030b5870c9d8e0fa930423761048':
  [FRP] Open the lock setup screens in same task
 2014-12-15 17:56:32 +00:00
Maurice Lam
4e8a7219c8 am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev 
* commit '8e0929a32ed60b95a34416a5362df93f5a329b5f':
  [FRP] Open the lock setup screens in same task
 2014-12-15 17:49:49 +00:00
Maurice Lam
8e0929a32e Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev 2014-12-15 17:44:53 +00:00
Narayan Kamath
62d35b65f2 resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp 
Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a
 2014-12-15 16:27:39 +00:00
Alexandra Gherghina
cee402a5f4 Make spinner icons circular 
Bug: 18311493
Change-Id: I73bd3951e2613254c1db3e8c0f2f1d174e1e4b6c
 2014-12-15 15:53:47 +00:00
Geoff Mendal
7068d702bd Merge "Import translations. DO NOT MERGE" 2014-12-15 15:10:50 +00:00
Geoff Mendal
755005bddf am d9df577d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'd9df577d94828775e20f20ab1efa02d8a7a5bbac':
  Import translations. DO NOT MERGE
 2014-12-15 15:08:45 +00:00
Geoff Mendal
d9df577d94 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-15 15:04:33 +00:00
Geoff Mendal
b939b7a07f Import translations. DO NOT MERGE 
Change-Id: Id43a27b90423827306f25836b7ef619c7a35c590
Auto-generated-cl: translation import
 2014-12-15 06:53:16 -08:00
Geoff Mendal
43826e6696 am d33d2127: (-s ours) am d3affe47: (-s ours) Import translations. DO NOT MERGE 
* commit 'd33d2127f739083c2f23a99eecd6bc3f21b53b83':
  Import translations. DO NOT MERGE
 2014-12-15 14:43:37 +00:00
Geoff Mendal
7e5cd2830f Import translations. DO NOT MERGE 
Change-Id: I1cd9781471c0c3c1c74fc429e9013e9e8dfeef41
Auto-generated-cl: translation import
 2014-12-15 06:42:32 -08:00
Geoff Mendal
d33d2127f7 am d3affe47: (-s ours) Import translations. DO NOT MERGE 
* commit 'd3affe47eedcdc6aa2bfd829f55fce8ed2be7e72':
  Import translations. DO NOT MERGE
 2014-12-15 14:36:51 +00:00
Narayan Kamath
206d1d385c Merge "Stop using apache-http in settings." 2014-12-15 14:35:21 +00:00
Narayan Kamath
7a250b8288 Stop using apache-http in settings. 
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

(cherry picked from commit f25627c0c9)

Change-Id: I62b0c4e79812ae69767d778eb9e866cbba1d50e0
 2014-12-15 14:32:38 +00:00
Zoltan Szatmary-Ban
903fa3f8eb Badge items in Settings > Apps > Running correctly 
That is, add a badge if the item belongs to a managed profile and
do not add if it belongs to the primary.

Bug: 18235061
Change-Id: Ice599b30cd2827180c21c8d0601af7f30b46e94b
 2014-12-15 14:28:39 +00:00
Geoff Mendal
d3affe47ee Import translations. DO NOT MERGE 
Change-Id: I07a9426156ec5f40cded12af58aca05723a55005
Auto-generated-cl: translation import
 2014-12-15 06:26:44 -08:00
Narayan Kamath
fa89388641 Merge "Stop using apache-http in settings." 2014-12-15 14:23:47 +00:00
Zoltan Szatmary-Ban
2960b9392e Merge "Show removed user's data usage under its correct item" 2014-12-15 11:22:24 +00:00
Lucky Zhang
a6f6e5a35b am 03f336d0: am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 
* commit '03f336d07c055b6870dd18ab0096f9e5b085ff51':
  [FRP] Notification screen slides in wrong direction
 2014-12-13 00:29:43 +00:00
Lucky Zhang
03f336d07c am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 
* commit '5f17119f4683617ed5444c088b0439bb005a3514':
  [FRP] Notification screen slides in wrong direction
 2014-12-13 00:24:20 +00:00
Lucky Zhang
5f17119f46 Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 2014-12-13 00:15:32 +00:00
John Spurlock
3d51b61f6c am 3eaa3506: am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text. 
* commit '3eaa35064a4e5a2eb1c57b465903e36774e27820':
  Settings: Allow more lines of saver feature description text.
 2014-12-12 20:56:40 +00:00
PauloftheWest
a886d69f9d Fixed then icons of SIMs in the call dialog. 
Bug: 18672758
Change-Id: I812e79a48b048f8449cc07fdcccab57a114cdd24
 2014-12-12 12:21:17 -08:00
John Spurlock
3eaa35064a am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text. 
* commit 'e964060b5de4b534431b58c2ac4fae9fdd6baedc':
  Settings: Allow more lines of saver feature description text.
 2014-12-12 19:08:46 +00:00
John Spurlock
e964060b5d am b4805e3a: Settings: Allow more lines of saver feature description text. 
* commit 'b4805e3a3481196a0e945d397bef0950a843f5a3':
  Settings: Allow more lines of saver feature description text.
 2014-12-12 19:04:24 +00:00
Zoltan Szatmary-Ban
cd9b1507fb Show removed user's data usage under its correct item 
Users for which UserManager.getUserInfo returned null were shown as
unnamed users on Settings > Data Usage. This behavior has now changed
to show their data usage under the same item as UID_REMOVED.

Bug: 18174376
Change-Id: I8d172647edb51f7a277b4b714e9b7f3a0b5f3154
 2014-12-12 18:48:03 +00:00