drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,158 Commits 1 Branch 0 Tags
Commit Graph

143158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
57103ba86d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 18:24:25 +00:00
Baligh Uddin
a17d1d2733 Import translations. DO NOT MERGE 
Change-Id: I73983e44eec615f929d27351032fd1d532ee68a1
Auto-generated-cl: translation import
 2014-07-20 12:03:51 -07:00
Sandeep Siddhartha
055897208d Move sound trigger calls to VoiceInteractionManagerService 
- This ensures that any data being loaded on the DSP comes from the framework

Change-Id: Ie15f0994850ba8f298ca07c49fe0b89e066d9e2b
 2014-07-20 11:22:55 -07:00
Evan Charlton
6eb262c351 Rename PhoneAccount to PhoneAccountHandle 
Change-Id: I2e97b348e6316a8b3ccc39fd81013e7f514a2889
 2014-07-20 10:34:59 -07:00
John Spurlock
8b4f091b49 Merge "Volume: haptic feedback entering vibrate using touch." into lmp-dev 2014-07-17 19:26:18 +00:00
John Spurlock
ac9ab5b4e7 Volume: haptic feedback entering vibrate using touch. 
Bug:15386667
Change-Id: Ia575c171f59f435afe669c2b7fd9c22155865b20
 2014-07-20 13:09:44 -04:00
John Spurlock
eb2727bb2f Volume: new coat of paint. 
- Two sections (lighter header, darker detail) like QS.
- Fewer text variants.
- Remove backgrounds for segmented buttons.
- Remove alarm warning background.
- Fix slider-only style.
- Ensure all touch-targets are 48dp.

Bug:16419191

Change-Id: I220f3a736eba3dd7a1b9ff58a8fe4bf3d21db61a
 2014-07-20 02:50:34 -04:00
John Spurlock
8d9c5ad809 Merge "Volume: Design followup." into lmp-dev 2014-07-20 04:41:30 +00:00
John Spurlock
4f558f7301 Volume: Design followup. 
Fix button height so header matches QS, use same elevation between
layers.

Bug:16419191
Change-Id: I56d9c69fe72e926261a32579a0b142d2fac18871
 2014-07-20 11:50:35 -04:00
David Friedman
00510833be am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '119716f40466018e789d86b3005b6c839de85b8c':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 12:49:57 +00:00
David Friedman
119716f404 am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '0d5af3f67bdd3734304a19dad45d995e93b6e957':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 12:43:19 +00:00
David Friedman
0d5af3f67b am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '5d59d371f27008214f29febb0595b602edddcc67':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 07:59:05 +00:00
Quddus Chong
9fc983f56a am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit 'f0804df14263bd4f4f3a8bd1f21edd1f741dd8da':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-18 23:08:59 +00:00
Quddus Chong
f0804df142 am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit '349e5760e701750babdc0f776e51ff2672f7ed2d':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-18 23:04:21 +00:00
Deepanshu Gupta
296459ffbb am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'f498991062d86e4cbf1c9880346a7feb8c428912':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:39:22 +00:00
Deepanshu Gupta
f498991062 am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'd32dd2948d95a01e6b581ffbc357cf759bae0242':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:35:37 +00:00
Deepanshu Gupta
d32dd2948d am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'b86675f14bea0c833f0ac3f0ec4d3e5f46784569':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:31:17 +00:00
Deepanshu Gupta
b86675f14b am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'f2c5a9ee4944b5ca995d0c6b11ccaddecf6432e1':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:26:45 +00:00
Deepanshu Gupta
f2c5a9ee49 am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'b9efa1e5a11d1542d0bab9c945ce1e920b819764':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:22:24 +00:00
Deepanshu Gupta
5d6322a527 am ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'ad3ccc741b867c4344e4c6c2338e02052244ae60':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:17:36 +00:00
Quddus Chong
349e5760e7 docs: Fixed bugs in Game Controller training doc. 
bug: 16375247, 14671463

Change-Id: I51f595065435c3990a979a66b402acc2b6867a1a
 2014-07-18 22:17:22 +00:00
Deepanshu Gupta
b9efa1e5a1 am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '14a4e69cc656b60c705d2f05229aed2a7049693c':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:17:00 +00:00
Deepanshu Gupta
90824671b6 am 98b24366: am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '98b243660c56129a0e2962e2faeeef1b65409210':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 22:12:11 +00:00
Deepanshu Gupta
ad3ccc741b am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '3f51ab0d81b3f24a0246f3bfe28ea5b364b48210':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:12:10 +00:00
Deepanshu Gupta
14a4e69cc6 am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'c735197420948ffff757dbe6d00028a87ed09c15':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:12:02 +00:00
Deepanshu Gupta
4ff3c7f007 am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '08840806b8dbc6c81ec69f409e38ca07f64da528':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:07:47 +00:00
Deepanshu Gupta
c735197420 am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'a3966c66ee24109ca4b71f591f0d740ee37987de':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:07:40 +00:00
Deepanshu Gupta
3f51ab0d81 am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '3c92b93226195523ff857763901a33847165ee9e':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:07:31 +00:00
Deepanshu Gupta
98b243660c am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c35afdfd4c40e55e235791341c515bd012d77146':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 22:06:44 +00:00
Deepanshu Gupta
08840806b8 am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '7f98066dd1a2a05d53ba39108dd4d44430e89c71':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:02:28 +00:00
Deepanshu Gupta
3c92b93226 am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '62b81acbcad6ceaa269c7f788068bdf32f403040':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:02:14 +00:00
Deepanshu Gupta
c35afdfd4c am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'cee55fc19bc9542d17081568ba082b56b5e5d04d':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 22:02:07 +00:00
Deepanshu Gupta
a3966c66ee am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '627439401ec86a083eefdc61728d6aa75ce9a4e5':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:01:45 +00:00
Deepanshu Gupta
276ae4eee5 am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '8613f826289d627df07971f074a2852012fc98b7':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 22:00:01 +00:00
Deepanshu Gupta
627439401e am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '8c71ff298b10ebdd3e5dec6f69f70176161b7e0a':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:58:42 +00:00
Deepanshu Gupta
7f98066dd1 am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '4c312f20cafc3160e04224f18cacd8d35a7f9e3c':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:57:44 +00:00
Deepanshu Gupta
62b81acbca am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '2df48bed6afed4958835b8bdc2c8b44db32919fc':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:57:16 +00:00
Deepanshu Gupta
cee55fc19b am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '99286edc3ef164d0d247a86cc58c391e5854aa70':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:57:01 +00:00
Deepanshu Gupta
8c71ff298b am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '87234e8544370d86b305fc55d6a5021c38b65495':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:55:21 +00:00
Deepanshu Gupta
8613f82628 am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'efd29681d8f8df6d23a1e7f307e9300bd8331a2f':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:54:59 +00:00
Deepanshu Gupta
0804e0aded am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit 'a9e488a6d2b20ecc91412072a5f39022d7fe6926':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:53:37 +00:00
Deepanshu Gupta
99286edc3e am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'aa0c1c755c15fec30f005d53bed6091180c4e521':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:53:15 +00:00
Deepanshu Gupta
2df48bed6a am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '1bdfeadb61343a5331fcfda06b40a0e3042a2ae6':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:53:11 +00:00
Deepanshu Gupta
4c312f20ca am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit 'a3d2c7e72b1580ebeffe7b4deaa46103d3d66fa7':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:52:52 +00:00
Deepanshu Gupta
efd29681d8 am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '964591a6e1be2d19dcd00229aa5ed50acd4847e6':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:50:15 +00:00
Deepanshu Gupta
87234e8544 am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '9c48ab82084828087c47086f2379b4927ec057e2':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:50:15 +00:00
Deepanshu Gupta
aa0c1c755c am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'e83fa180a874fb9222ae8e87c0d333411decc0c7':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:49:13 +00:00
Deepanshu Gupta
1bdfeadb61 am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '610341b3eb99ef2f070c96d60ca30c28283f1dea':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:49:11 +00:00
Deepanshu Gupta
a9e488a6d2 am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit 'd8d3e87cf339deaf890e4b083d09b074065cd35f':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:48:05 +00:00
Deepanshu Gupta
d7f2bf067f am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'f75489f2f1f2dc4f75205f4b242800777bf7d5ec':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:45:47 +00:00