Dave Langemak
fedbe2723a
am 4a6a8e5e: Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev
...
* commit '4a6a8e5e3cce491064d6836b59c23fd076de56f2':
Move dis/enable of mobile data to Telephony
2014-05-27 22:24:21 +00:00
Jeff Brown
aae5886ad8
Merge "Split frameworks/base using inclusion and exclusion rules."
2014-05-27 21:47:06 +00:00
Dave Langemak
dab839e047
Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev
2014-05-27 21:26:52 +00:00
Deepanshu Gupta
b00cb8b8c7
Merge "Layoutlib fixes for L"
2014-05-27 21:18:04 +00:00
Deepanshu Gupta
335daa8c6c
Merge "Recurse into directories to find fonts."
2014-05-27 20:59:17 +00:00
Deepanshu Gupta
b6f583aa70
Recurse into directories to find fonts.
...
We now recurse into directories to find all fonts. This change is needed
to prevent having to list all fonts in external/google-fonts
individually.
As a side effect, we now only copy xml files over.
Change-Id: Ifdea3b8451878c2449ac7c5e17ef3d1b00d1b955
2014-05-27 13:57:15 -07:00
Leon Scroggins III
8f8c085164
Merge "Remove call to deprecated SkBitmap::asImageInfo."
2014-05-27 20:42:44 +00:00
Deepanshu Gupta
233a0ae88d
Merge "Parallel processing of the fonts."
2014-05-27 20:34:57 +00:00
Jorim Jaggi
51c9108cab
am 4caed7a3: Merge "Remove charging text and carrier label on bouncer." into lmp-preview-dev
...
* commit '4caed7a3d8c0f6b378205cc85e7e1340d56a48c0':
Remove charging text and carrier label on bouncer.
2014-05-27 20:32:40 +00:00
Ashish Sharma
87e522efcc
am 7279017f: Include START event (reboots) in partial history.
...
* commit '7279017f52ca1db58eb95bf881f3a2e238a7c2bd':
Include START event (reboots) in partial history.
2014-05-27 20:32:34 +00:00
Jorim Jaggi
2d6f780cc5
Merge "Remove charging text and carrier label on bouncer." into lmp-preview-dev
2014-05-27 20:30:28 +00:00
Robert Greenwalt
afa05c0b43
Move dis/enable of mobile data to Telephony
...
ConnectivityService doesn't do this anymore.
bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 53013c87496980b534e447e717a32698fbd4bca0)
2014-05-27 20:28:50 +00:00
Ashish Sharma
6020071df9
Include START event (reboots) in partial history.
...
Change-Id: Ia1e5fba6c2c7bdb3f09eb5958d7134564d60e8b0
2014-05-27 20:27:59 +00:00
Jorim Jaggi
071956a6dd
am f4f40563: Merge "Remove up pointing arrow in navbar." into lmp-preview-dev
...
* commit 'f4f405636e11bd79128135c60d1fa92ab53fc3f2':
Remove up pointing arrow in navbar.
2014-05-27 20:27:36 +00:00
Jorim Jaggi
6ecbe3f2d6
Merge "Remove up pointing arrow in navbar." into lmp-preview-dev
2014-05-27 20:24:48 +00:00
Jorim Jaggi
7b0de297e1
Remove up pointing arrow in navbar.
...
We don't need it anymore. Yay!
Bug: 15283575
Change-Id: Iac5543a733c047711e5c37f290758456116469a5
2014-05-27 22:22:51 +02:00
Jorim Jaggi
40a0b38160
Remove charging text and carrier label on bouncer.
...
But still show it for SIM PIN/PUK.
Bug: 15283575
Change-Id: Id343e5b2fb5c695f46cd23d8509109987fa2d290
2014-05-27 22:20:37 +02:00
Leon Scroggins III
28408c2395
Remove call to deprecated SkBitmap::asImageInfo.
...
Instead, call SkBitmap::info().
Change-Id: Ib6e56c6e103afa5748405574043860449c33c467
2014-05-27 16:20:21 -04:00
ztenghui
bd67759a3d
Merge "Bring the group tag back to VectorDrawable."
2014-05-27 20:08:23 +00:00
John Spurlock
60a46d62a8
am 97c0a61f: Better wifi-enabled signal from network controller.
...
* commit '97c0a61f4a239889e6ffc91994ac90e25a09f997':
Better wifi-enabled signal from network controller.
2014-05-27 19:57:34 +00:00
John Spurlock
3d09bbd04f
Better wifi-enabled signal from network controller.
...
The old "is wifi enabled" signal was geared toward the cluster
view. Since the clients of the callbacks are now only QS tiles,
make sure to plumb through the actual enabled value all the way
up to the tile.
Bug:15161053
Change-Id: I8b69c599f06d5b36e3f44dc666e1621840ffd927
(cherry picked from commit fd0ea545d47b19c2ebff203a6e768a60698f3609)
2014-05-27 19:34:10 +00:00
Deepanshu Gupta
c7919924c6
Parallel processing of the fonts.
...
Font renaming for the SDK is now done in parallel.
This now reduces the running time for this script from about 30 mins to
about 5 to 10 mins. More speedup is expected when fonttools is updated.
Change-Id: I2c405f6d3e637e3067c8a1653e3cae206c32c0c3
2014-05-27 12:31:13 -07:00
Winson Chung
a64a5fe68c
am bff02603: Merge "Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)" into lmp-preview-dev
...
* commit 'bff026033d40ee48e9bf8dca17e1fbbee8b41293':
Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)
2014-05-27 19:30:40 +00:00
Winson Chung
8804ce96b1
Merge "Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)" into lmp-preview-dev
2014-05-27 19:28:51 +00:00
Aravind Akella
1a68f24ab7
Merge "Adding wakeup sensors, maxDelay to java SDK."
2014-05-27 19:25:41 +00:00
Chris Wren
42db9d0b23
am ba8af498: Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev
...
* commit 'ba8af498f08d4ac2e7712a8d307d24112ca1bc8e':
Reduce logspam by catching unexpected types ourselves.
2014-05-27 19:20:56 +00:00
Chris Wren
2ed67e6de7
Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev
2014-05-27 19:15:25 +00:00
Jorim Jaggi
64554ad5f1
am 554f868c: Merge "Skeleton for Keyguard security method appear animations." into lmp-preview-dev
...
* commit '554f868c94ad72ef12b6f2c966bd9709ead5c4e7':
Skeleton for Keyguard security method appear animations.
2014-05-27 18:34:38 +00:00
Jorim Jaggi
c41a7a1bb6
am 80aee1d5: Merge "Show bouncer immediately when MOTION_UP is received" into lmp-preview-dev
...
* commit '80aee1d5e5d0095551c76fc4d52fa0616b0e5aeb':
Show bouncer immediately when MOTION_UP is received
2014-05-27 18:34:33 +00:00
Jorim Jaggi
fbd168331c
Merge "Skeleton for Keyguard security method appear animations." into lmp-preview-dev
2014-05-27 18:31:57 +00:00
Jorim Jaggi
37d5c23998
Merge "Show bouncer immediately when MOTION_UP is received" into lmp-preview-dev
2014-05-27 18:31:10 +00:00
Deepanshu Gupta
8c1040f27d
Merge "Add multiple dir support to build_font.py"
2014-05-27 18:14:56 +00:00
Etienne Le Grand
ef0b88181e
am 7326defe: am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev
...
* commit '7326defe2de7ace86236bf0c5353fe0687c3f99c':
Add confidence to the heart rate monitor definition and clarify onAccuracyChange
2014-05-27 18:10:52 +00:00
Winson Chung
9693d95343
Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)
...
Change-Id: I371ee43296a983782eaed2e661b1febc71c86433
2014-05-27 11:09:22 -07:00
Winson Chung
bd742e4694
am 872f0213: (-s ours) Merge "DO NOT MERGE" into lmp-preview-dev
...
* commit '872f021357af59f12983c65d30d5cbb4b6dc7958':
DO NOT MERGE
2014-05-27 18:08:59 +00:00
Etienne Le Grand
7326defe2d
am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev
...
* commit 'd7439d8c59e4c5a82ad94a5080436cc94f72e0be':
Add confidence to the heart rate monitor definition and clarify onAccuracyChange
2014-05-27 18:06:13 +00:00
Winson Chung
5859fc1096
Merge "DO NOT MERGE" into lmp-preview-dev
2014-05-27 18:04:36 +00:00
John Spurlock
6625a27d4c
am e09eb7dc: Merge "frameworks/base: Performance tweaks for SeekBarVolumizer." into lmp-preview-dev
...
* commit 'e09eb7dcc5b17d913c601aaa49ae12470fed97e6':
frameworks/base: Performance tweaks for SeekBarVolumizer.
2014-05-27 18:03:46 +00:00
Etienne Le Grand
d7439d8c59
Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev
2014-05-27 18:03:13 +00:00
John Spurlock
150c07993f
Merge "frameworks/base: Performance tweaks for SeekBarVolumizer." into lmp-preview-dev
2014-05-27 17:58:48 +00:00
John Spurlock
e56405c69b
am de837355: Merge "Remove airplane, bugreport, and ringer mode global actions." into lmp-preview-dev
...
* commit 'de8373552cbbc685bd45e529082c528907405037':
Remove airplane, bugreport, and ringer mode global actions.
2014-05-27 17:51:43 +00:00
Baligh Uddin
498cb6282c
Merge "Import translations. DO NOT MERGE"
2014-05-27 17:51:34 +00:00
John Spurlock
4bb35da6ce
Merge "Remove airplane, bugreport, and ringer mode global actions." into lmp-preview-dev
2014-05-27 17:48:14 +00:00
Christoph Studer
fd76bb5f93
am aafcbc8f: (-s ours) Merge "NoMan: Disable SQLite log DO NOT MERGE" into lmp-preview-dev
...
* commit 'aafcbc8f030c6de7fbb77272d588de53a96b9a35':
NoMan: Disable SQLite log DO NOT MERGE
2014-05-27 17:45:25 +00:00
Christoph Studer
21b6c49a2d
am f626c676: Merge "NoMan: Allow disabling SQLiteLog." into lmp-preview-dev
...
* commit 'f626c67604a317bbcb1963a71b66a30b92df2973':
NoMan: Allow disabling SQLiteLog.
2014-05-27 17:45:19 +00:00
Christoph Studer
d68200c66b
Merge "NoMan: Disable SQLite log DO NOT MERGE" into lmp-preview-dev
2014-05-27 17:41:34 +00:00
Christoph Studer
e397521449
Merge "NoMan: Allow disabling SQLiteLog." into lmp-preview-dev
2014-05-27 17:41:03 +00:00
Wink Saville
ec16a95928
Merge "Hide LogicalChannel operations developer preview."
2014-05-27 17:40:31 +00:00
Eric Laurent
bac10fa652
Merge "AudioManager: audio routing extensions"
2014-05-27 17:35:30 +00:00
John Spurlock
17f3f16c4f
Remove airplane, bugreport, and ringer mode global actions.
...
Bug:15281315
Change-Id: I16aa759a3269bb7757350edf2330cd72fd99a023
2014-05-27 13:32:04 -04:00